The patch titled
Subject: rtc: ds1307: refactor chip_desc table
has been removed from the -mm tree. Its filename was
rtc-ds1307-refactor-chip_desc-table.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Subject: rtc: ds1307: refactor chip_desc table
The chip_desc table is suboptimal. Currently it requires an entry for
every new chip type, even if it is empty. This has already been forgotten
for the ds1388. Refactor the code, so new entries are only needed, when
they chip type really needs a (non-empty) description. Also make the
table visually more appealing.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Cc: Austin Boyle <Austin.Boyle@xxxxxxxxxxxx>
Cc: David Anders <danders.dev@xxxxxxxxx>
Cc: Alessandro Zummo <alessandro.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-ds1307.c | 48 ++++++++++++++-----------------------
1 file changed, 19 insertions(+), 29 deletions(-)
diff -puN drivers/rtc/rtc-ds1307.c~rtc-ds1307-refactor-chip_desc-table drivers/rtc/rtc-ds1307.c
--- a/drivers/rtc/rtc-ds1307.c~rtc-ds1307-refactor-chip_desc-table
+++ a/drivers/rtc/rtc-ds1307.c
@@ -36,6 +36,7 @@ enum ds_type {
m41t00,
mcp7941x,
rx_8025,
+ last_ds_type /* always last */
// rs5c372 too? different address...
};
@@ -120,30 +121,23 @@ struct chip_desc {
unsigned alarm:1;
};
-static const struct chip_desc chips[] = {
-[ds_1307] = {
- .nvram56 = 1,
-},
-[ds_1337] = {
- .alarm = 1,
-},
-[ds_1338] = {
- .nvram56 = 1,
-},
-[ds_1339] = {
- .alarm = 1,
-},
-[ds_1340] = {
-},
-[ds_3231] = {
- .alarm = 1,
-},
-[m41t00] = {
-},
-[mcp7941x] = {
-},
-[rx_8025] = {
-}, };
+static const struct chip_desc chips[last_ds_type] = {
+ [ds_1307] = {
+ .nvram56 = 1,
+ },
+ [ds_1337] = {
+ .alarm = 1,
+ },
+ [ds_1338] = {
+ .nvram56 = 1,
+ },
+ [ds_1339] = {
+ .alarm = 1,
+ },
+ [ds_3231] = {
+ .alarm = 1,
+ },
+};
static const struct i2c_device_id ds1307_id[] = {
{ "ds1307", ds_1307 },
@@ -836,11 +830,7 @@ read_rtc:
}
break;
- case rx_8025:
- case ds_1337:
- case ds_1339:
- case ds_1388:
- case ds_3231:
+ default:
break;
}
_
Patches currently in -mm which might be from w.sang@xxxxxxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
