summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-05-18 22:49:40 +0400
committerJean Delvare <khali@hyperion.delvare>2008-05-18 22:49:40 +0400
commit238a871e41ffbd9ba6608cac7c8b74549ac3bb9b (patch)
tree8a9d223126e2be1e4e922c2b99e3708da5ffa39f /arch
parent24fbacca029ef1ecf007dc804c8f2c2285b6ceb3 (diff)
downloadlinux-238a871e41ffbd9ba6608cac7c8b74549ac3bb9b.tar.xz
i2c: Switch pasemi to the new device/driver matching scheme
The old device/driver matching scheme is going away so stop using it. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/pasemi/misc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/pasemi/misc.c b/arch/powerpc/platforms/pasemi/misc.c
index ded7d152d00c..e0ab299763c1 100644
--- a/arch/powerpc/platforms/pasemi/misc.c
+++ b/arch/powerpc/platforms/pasemi/misc.c
@@ -24,12 +24,11 @@
*/
struct i2c_driver_device {
char *of_device;
- char *i2c_driver;
char *i2c_type;
};
static struct i2c_driver_device i2c_devices[] __initdata = {
- {"dallas,ds1338", "rtc-ds1307", "ds1338"},
+ {"dallas,ds1338", "ds1338"},
};
static int __init find_i2c_driver(struct device_node *node,
@@ -40,9 +39,7 @@ static int __init find_i2c_driver(struct device_node *node,
for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
if (!of_device_is_compatible(node, i2c_devices[i].of_device))
continue;
- if (strlcpy(info->driver_name, i2c_devices[i].i2c_driver,
- KOBJ_NAME_LEN) >= KOBJ_NAME_LEN ||
- strlcpy(info->type, i2c_devices[i].i2c_type,
+ if (strlcpy(info->type, i2c_devices[i].i2c_type,
I2C_NAME_SIZE) >= I2C_NAME_SIZE)
return -ENOMEM;
return 0;