Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rtc-ds1374: rename device to just "ds1374"

Change the name of the device from "rtc-ds1374" to just "ds1374", to match
what all other RTC drivers do. I seem to remember that this name was
chosen to avoid possible confusion with an older ds1374 driver, but that
driver was removed 3 months ago.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jean Delvare and committed by
Linus Torvalds
f2eb4327 44d1b980

+2 -3
+1 -1
arch/powerpc/sysdev/fsl_soc.c
··· 432 432 {"dallas,ds1339", "ds1339"}, 433 433 {"dallas,ds1340", "ds1340"}, 434 434 {"stm,m41t00", "m41t00"}, 435 - {"dallas,ds1374", "rtc-ds1374"}, 435 + {"dallas,ds1374", "ds1374"}, 436 436 }; 437 437 438 438 static int __init of_find_i2c_driver(struct device_node *node,
-1
drivers/of/of_i2c.c
··· 21 21 }; 22 22 23 23 static struct i2c_driver_device i2c_devices[] = { 24 - { "dallas,ds1374", "rtc-ds1374" }, 25 24 }; 26 25 27 26 static int of_find_i2c_driver(struct device_node *node,
+1 -1
drivers/rtc/rtc-ds1374.c
··· 42 42 #define DS1374_REG_TCR 0x09 /* Trickle Charge */ 43 43 44 44 static const struct i2c_device_id ds1374_id[] = { 45 - { "rtc-ds1374", 0 }, 45 + { "ds1374", 0 }, 46 46 { } 47 47 }; 48 48 MODULE_DEVICE_TABLE(i2c, ds1374_id);