From 9bcea5a2e42d82f8ff7f38f03bb1b4d062e3ae2f Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 10 Dec 2006 21:21:31 +0100 Subject: [PATCH] --- yaml --- r: 44344 b: refs/heads/master c: 7b77d065d1e79a9c0b1b114d059b3bc3d8206c4d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/i2c-core.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a39f17563d2b..d9235ec63432 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 438d6c2c015cf63bf7e9bdc2033d435433ac8455 +refs/heads/master: 7b77d065d1e79a9c0b1b114d059b3bc3d8206c4d diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c index 64f11e00651c..3e31f1d265c9 100644 --- a/trunk/drivers/i2c/i2c-core.c +++ b/trunk/drivers/i2c/i2c-core.c @@ -128,14 +128,11 @@ static ssize_t show_client_name(struct device *dev, struct device_attribute *att } /* - * We can't use the DEVICE_ATTR() macro here as we want the same filename for a - * different type of a device. So beware if the DEVICE_ATTR() macro ever - * changes, this definition will also have to change. + * We can't use the DEVICE_ATTR() macro here, as we used the same name for + * an i2c adapter attribute (above). */ -static struct device_attribute dev_attr_client_name = { - .attr = {.name = "name", .mode = S_IRUGO, .owner = THIS_MODULE }, - .show = &show_client_name, -}; +static struct device_attribute dev_attr_client_name = + __ATTR(name, S_IRUGO, &show_client_name, NULL); /* ---------------------------------------------------