From 845bd12ac78f92ba8905f45de7e17a4a8b3cef40 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:41:44 +0100 Subject: staging:iio: use the new central name attribute creation code Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/adc/ad7150.c | 15 +-------------- drivers/staging/iio/adc/ad7152.c | 15 +-------------- drivers/staging/iio/adc/ad7291.c | 17 ++--------------- drivers/staging/iio/adc/ad7298_core.c | 13 +------------ drivers/staging/iio/adc/ad7314.c | 19 +++---------------- drivers/staging/iio/adc/ad7476_core.c | 22 +--------------------- drivers/staging/iio/adc/ad7745.c | 15 +-------------- drivers/staging/iio/adc/ad7780.c | 13 +------------ drivers/staging/iio/adc/ad7816.c | 32 +++++++++----------------------- drivers/staging/iio/adc/ad7887_core.c | 13 +------------ drivers/staging/iio/adc/ad799x_core.c | 14 -------------- drivers/staging/iio/adc/adt7310.c | 21 ++++----------------- drivers/staging/iio/adc/adt7410.c | 20 +++----------------- drivers/staging/iio/adc/adt75.c | 19 +++---------------- drivers/staging/iio/adc/max1363_core.c | 21 +-------------------- 15 files changed, 32 insertions(+), 237 deletions(-) (limited to 'drivers/staging/iio/adc') diff --git a/drivers/staging/iio/adc/ad7150.c b/drivers/staging/iio/adc/ad7150.c index 6a9f3268290..cbd1f96188c 100644 --- a/drivers/staging/iio/adc/ad7150.c +++ b/drivers/staging/iio/adc/ad7150.c @@ -58,7 +58,6 @@ */ struct ad7150_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; bool inter; @@ -584,17 +583,6 @@ static IIO_DEV_ATTR_CH2_SETUP(S_IRUGO | S_IWUSR, ad7150_show_ch2_setup, ad7150_store_ch2_setup); -static ssize_t ad7150_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7150_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7150_show_name, NULL, 0); - static ssize_t ad7150_show_powerdown_timer(struct device *dev, struct device_attribute *attr, char *buf) @@ -643,7 +631,6 @@ static struct attribute *ad7150_attributes[] = { &iio_dev_attr_powerdown_timer.dev_attr.attr, &iio_dev_attr_ch1_value.dev_attr.attr, &iio_dev_attr_ch2_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -724,7 +711,6 @@ static int __devinit ad7150_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { @@ -733,6 +719,7 @@ static int __devinit ad7150_probe(struct i2c_client *client, } /* Echipabilish that the iio_dev is a child of the i2c device */ + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->attrs = &ad7150_attribute_group; chip->indio_dev->event_attrs = &ad7150_event_attribute_group; diff --git a/drivers/staging/iio/adc/ad7152.c b/drivers/staging/iio/adc/ad7152.c index 25715f08055..e53e3e9e586 100644 --- a/drivers/staging/iio/adc/ad7152.c +++ b/drivers/staging/iio/adc/ad7152.c @@ -50,7 +50,6 @@ */ struct ad7152_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; u16 ch1_offset; /* Channel 1 offset calibration coefficient */ @@ -479,17 +478,6 @@ static IIO_DEV_ATTR_FILTER_RATE_SETUP(S_IRUGO | S_IWUSR, ad7152_show_filter_rate_setup, ad7152_store_filter_rate_setup); -static ssize_t ad7152_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7152_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7152_show_name, NULL, 0); - static struct attribute *ad7152_attributes[] = { &iio_dev_attr_available_conversion_modes.dev_attr.attr, &iio_dev_attr_conversion_mode.dev_attr.attr, @@ -502,7 +490,6 @@ static struct attribute *ad7152_attributes[] = { &iio_dev_attr_ch1_setup.dev_attr.attr, &iio_dev_attr_ch2_setup.dev_attr.attr, &iio_dev_attr_filter_rate_setup.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -528,7 +515,6 @@ static int __devinit ad7152_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { @@ -537,6 +523,7 @@ static int __devinit ad7152_probe(struct i2c_client *client, } /* Echipabilish that the iio_dev is a child of the i2c device */ + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->attrs = &ad7152_attribute_group; chip->indio_dev->dev_data = (void *)(chip); diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c index 23ad18ec320..527311c1d3b 100644 --- a/drivers/staging/iio/adc/ad7291.c +++ b/drivers/staging/iio/adc/ad7291.c @@ -60,7 +60,6 @@ */ struct ad7291_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; u16 command; @@ -434,17 +433,6 @@ static IIO_DEVICE_ATTR(channel_mask, S_IRUGO | S_IWUSR, ad7291_store_channel_mask, 0); -static ssize_t ad7291_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7291_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7291_show_name, NULL, 0); - static struct attribute *ad7291_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, @@ -455,7 +443,6 @@ static struct attribute *ad7291_attributes[] = { &iio_dev_attr_t_average.dev_attr.attr, &iio_dev_attr_voltage.dev_attr.attr, &iio_dev_attr_channel_mask.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -784,7 +771,6 @@ static int __devinit ad7291_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK; chip->indio_dev = iio_allocate_device(0); @@ -793,6 +779,7 @@ static int __devinit ad7291_probe(struct i2c_client *client, goto error_free_chip; } + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->attrs = &ad7291_attribute_group; chip->indio_dev->event_attrs = &ad7291_event_attribute_group; @@ -810,7 +797,7 @@ static int __devinit ad7291_probe(struct i2c_client *client, NULL, &ad7291_event_handler, IRQF_TRIGGER_LOW | IRQF_ONESHOT, - chip->name, + id->name, chip->indio_dev); if (ret) goto error_unreg_dev; diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/staging/iio/adc/ad7298_core.c index 40bbb427918..d43f63d1f28 100644 --- a/drivers/staging/iio/adc/ad7298_core.c +++ b/drivers/staging/iio/adc/ad7298_core.c @@ -118,17 +118,6 @@ static ssize_t ad7298_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7298_show_scale, NULL, 0); -static ssize_t ad7298_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7298_state *st = iio_dev_get_devdata(dev_info); - - return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7298_show_name, NULL, 0); - static struct attribute *ad7298_attributes[] = { &iio_dev_attr_in0_raw.dev_attr.attr, &iio_dev_attr_in1_raw.dev_attr.attr, @@ -140,7 +129,6 @@ static struct attribute *ad7298_attributes[] = { &iio_dev_attr_in7_raw.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, &iio_dev_attr_temp0_input.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -177,6 +165,7 @@ static int __devinit ad7298_probe(struct spi_device *spi) goto error_disable_reg; } + st->indio_dev->name = spi_get_device_id(spi)->name; st->indio_dev->dev.parent = &spi->dev; st->indio_dev->attrs = &ad7298_attribute_group; st->indio_dev->dev_data = (void *)(st); diff --git a/drivers/staging/iio/adc/ad7314.c b/drivers/staging/iio/adc/ad7314.c index bc34e299a02..a1f1b4379c6 100644 --- a/drivers/staging/iio/adc/ad7314.c +++ b/drivers/staging/iio/adc/ad7314.c @@ -42,7 +42,6 @@ */ struct ad7314_chip_info { - const char *name; struct spi_device *spi_dev; struct iio_dev *indio_dev; s64 last_timestamp; @@ -155,7 +154,7 @@ static ssize_t ad7314_show_temperature(struct device *dev, if (chip->mode) ad7314_spi_write(chip, chip->mode); - if (strcmp(chip->name, "ad7314")) { + if (strcmp(dev_info->name, "ad7314")) { data = (data & AD7314_TEMP_MASK) >> AD7314_TEMP_OFFSET; if (data & AD7314_TEMP_SIGN) { @@ -181,22 +180,10 @@ static ssize_t ad7314_show_temperature(struct device *dev, static IIO_DEVICE_ATTR(temperature, S_IRUGO, ad7314_show_temperature, NULL, 0); -static ssize_t ad7314_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7314_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7314_show_name, NULL, 0); - static struct attribute *ad7314_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_temperature.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -222,7 +209,6 @@ static int __devinit ad7314_probe(struct spi_device *spi_dev) dev_set_drvdata(&spi_dev->dev, chip); chip->spi_dev = spi_dev; - chip->name = spi_dev->modalias; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { @@ -230,6 +216,7 @@ static int __devinit ad7314_probe(struct spi_device *spi_dev) goto error_free_chip; } + chip->indio_dev->name = spi_get_device_id(spi_dev)->name; chip->indio_dev->dev.parent = &spi_dev->dev; chip->indio_dev->attrs = &ad7314_attribute_group; chip->indio_dev->dev_data = (void *)chip; @@ -240,7 +227,7 @@ static int __devinit ad7314_probe(struct spi_device *spi_dev) goto error_free_dev; dev_info(&spi_dev->dev, "%s temperature sensor registered.\n", - chip->name); + chip->indio_dev->name); return 0; error_free_dev: diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c index 9729a1c9b59..5b41e0101e5 100644 --- a/drivers/staging/iio/adc/ad7476_core.c +++ b/drivers/staging/iio/adc/ad7476_core.c @@ -66,26 +66,6 @@ static int ad7476_read_raw(struct iio_dev *dev_info, return -EINVAL; } -static ssize_t ad7476_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7476_state *st = iio_dev_get_devdata(dev_info); - - return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7476_show_name, NULL, 0); - -static struct attribute *ad7476_attributes[] = { - &iio_dev_attr_name.dev_attr.attr, - NULL, -}; - -static const struct attribute_group ad7476_attribute_group = { - .attrs = ad7476_attributes, -}; - static const struct ad7476_chip_info ad7476_chip_info_tbl[] = { [ID_AD7466] = { .channel[0] = IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 0, 0, @@ -183,7 +163,7 @@ static int __devinit ad7476_probe(struct spi_device *spi) /* Establish that the iio_dev is a child of the spi device */ st->indio_dev->dev.parent = &spi->dev; - st->indio_dev->attrs = &ad7476_attribute_group; + st->indio_dev->name = spi_get_device_id(spi)->name; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; st->indio_dev->modes = INDIO_DIRECT_MODE; diff --git a/drivers/staging/iio/adc/ad7745.c b/drivers/staging/iio/adc/ad7745.c index cb1fc612b21..afa2648e08f 100644 --- a/drivers/staging/iio/adc/ad7745.c +++ b/drivers/staging/iio/adc/ad7745.c @@ -53,7 +53,6 @@ */ struct ad774x_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; bool inter; @@ -499,17 +498,6 @@ static IIO_DEV_ATTR_CAP_GAIN(S_IRUGO | S_IWUSR, ad774x_show_cap_gain, ad774x_store_cap_gain); -static ssize_t ad774x_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad774x_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad774x_show_name, NULL, 0); - static struct attribute *ad774x_attributes[] = { &iio_dev_attr_available_conversion_modes.dev_attr.attr, &iio_dev_attr_conversion_mode.dev_attr.attr, @@ -523,7 +511,6 @@ static struct attribute *ad774x_attributes[] = { &iio_dev_attr_cap0_raw.dev_attr.attr, &iio_dev_attr_capdac0_raw.dev_attr.attr, &iio_dev_attr_capdac1_raw.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -596,7 +583,6 @@ static int __devinit ad774x_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { @@ -605,6 +591,7 @@ static int __devinit ad774x_probe(struct i2c_client *client, } /* Establish that the iio_dev is a child of the i2c device */ + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->attrs = &ad774x_attribute_group; chip->indio_dev->event_attrs = &ad774x_event_attribute_group; diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index ab23c5cfdc2..f828e832a95 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -132,21 +132,9 @@ static ssize_t ad7780_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7780_show_scale, NULL, 0); -static ssize_t ad7780_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7780_state *st = iio_dev_get_devdata(dev_info); - - return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7780_show_name, NULL, 0); - static struct attribute *ad7780_attributes[] = { &iio_dev_attr_in0_raw.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -229,6 +217,7 @@ static int __devinit ad7780_probe(struct spi_device *spi) /* Establish that the iio_dev is a child of the spi device */ st->indio_dev->dev.parent = &spi->dev; + st->indio_dev->name = spi_get_device_id(spi)->name; st->indio_dev->attrs = &ad7780_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c index a062ec3da13..bee4209e881 100644 --- a/drivers/staging/iio/adc/ad7816.c +++ b/drivers/staging/iio/adc/ad7816.c @@ -42,7 +42,6 @@ */ struct ad7816_chip_info { - const char *name; struct spi_device *spi_dev; struct iio_dev *indio_dev; u16 rdwr_pin; @@ -181,13 +180,13 @@ static ssize_t ad7816_store_channel(struct device *dev, if (data > AD7816_CS_MAX && data != AD7816_CS_MASK) { dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for %s.\n", - data, chip->name); + data, dev_info->name); return -EINVAL; - } else if (strcmp(chip->name, "ad7818") == 0 && data > 1) { + } else if (strcmp(dev_info->name, "ad7818") == 0 && data > 1) { dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for ad7818.\n", data); return -EINVAL; - } else if (strcmp(chip->name, "ad7816") == 0 && data > 0) { + } else if (strcmp(dev_info->name, "ad7816") == 0 && data > 0) { dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for ad7816.\n", data); return -EINVAL; @@ -232,23 +231,11 @@ static ssize_t ad7816_show_value(struct device *dev, static IIO_DEVICE_ATTR(value, S_IRUGO, ad7816_show_value, NULL, 0); -static ssize_t ad7816_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7816_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7816_show_name, NULL, 0); - static struct attribute *ad7816_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_channel.dev_attr.attr, &iio_dev_attr_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -366,28 +353,27 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev) dev_set_drvdata(&spi_dev->dev, chip); chip->spi_dev = spi_dev; - chip->name = spi_dev->modalias; for (i = 0; i <= AD7816_CS_MAX; i++) chip->oti_data[i] = 203; chip->rdwr_pin = pins[0]; chip->convert_pin = pins[1]; chip->busy_pin = pins[2]; - ret = gpio_request(chip->rdwr_pin, chip->name); + ret = gpio_request(chip->rdwr_pin, spi_get_device_id(spi_dev)->name); if (ret) { dev_err(&spi_dev->dev, "Fail to request rdwr gpio PIN %d.\n", chip->rdwr_pin); goto error_free_chip; } gpio_direction_input(chip->rdwr_pin); - ret = gpio_request(chip->convert_pin, chip->name); + ret = gpio_request(chip->convert_pin, spi_get_device_id(spi_dev)->name); if (ret) { dev_err(&spi_dev->dev, "Fail to request convert gpio PIN %d.\n", chip->convert_pin); goto error_free_gpio_rdwr; } gpio_direction_input(chip->convert_pin); - ret = gpio_request(chip->busy_pin, chip->name); + ret = gpio_request(chip->busy_pin, spi_get_device_id(spi_dev)->name); if (ret) { dev_err(&spi_dev->dev, "Fail to request busy gpio PIN %d.\n", chip->busy_pin); @@ -400,7 +386,7 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev) ret = -ENOMEM; goto error_free_gpio; } - + chip->indio_dev->name = spi_get_device_id(spi_dev)->name; chip->indio_dev->dev.parent = &spi_dev->dev; chip->indio_dev->attrs = &ad7816_attribute_group; chip->indio_dev->event_attrs = &ad7816_event_attribute_group; @@ -419,14 +405,14 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev) NULL, &ad7816_event_handler, IRQF_TRIGGER_LOW, - chip->name, + chip->indio_dev->name, chip->indio_dev); if (ret) goto error_unreg_dev; } dev_info(&spi_dev->dev, "%s temperature sensor and ADC registered.\n", - chip->name); + chip->indio_dev->name); return 0; diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c index 42e9cd7c60a..27adff428c2 100644 --- a/drivers/staging/iio/adc/ad7887_core.c +++ b/drivers/staging/iio/adc/ad7887_core.c @@ -72,22 +72,10 @@ static ssize_t ad7887_show_scale(struct device *dev, } static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad7887_show_scale, NULL, 0); -static ssize_t ad7887_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7887_state *st = iio_dev_get_devdata(dev_info); - - return sprintf(buf, "%s\n", spi_get_device_id(st->spi)->name); -} -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7887_show_name, NULL, 0); - static struct attribute *ad7887_attributes[] = { &iio_dev_attr_in0_raw.dev_attr.attr, &iio_dev_attr_in1_raw.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -160,6 +148,7 @@ static int __devinit ad7887_probe(struct spi_device *spi) /* Estabilish that the iio_dev is a child of the spi device */ st->indio_dev->dev.parent = &spi->dev; + st->indio_dev->name = spi_get_device_id(spi)->name; st->indio_dev->attrs = &ad7887_attribute_group; st->indio_dev->dev_data = (void *)(st); st->indio_dev->driver_module = THIS_MODULE; diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c index 009efb85d0b..3383a35817e 100644 --- a/drivers/staging/iio/adc/ad799x_core.c +++ b/drivers/staging/iio/adc/ad799x_core.c @@ -426,23 +426,11 @@ static ssize_t ad799x_show_scale(struct device *dev, static IIO_DEVICE_ATTR(in_scale, S_IRUGO, ad799x_show_scale, NULL, 0); -static ssize_t ad799x_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad799x_state *st = iio_dev_get_devdata(dev_info); - return sprintf(buf, "%s\n", st->client->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad799x_show_name, NULL, 0); - static struct attribute *ad7991_5_9_3_4_device_attrs[] = { &iio_dev_attr_in0_raw.dev_attr.attr, &iio_dev_attr_in1_raw.dev_attr.attr, &iio_dev_attr_in2_raw.dev_attr.attr, &iio_dev_attr_in3_raw.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, NULL }; @@ -475,7 +463,6 @@ static struct attribute_group ad7991_5_9_3_4_scan_el_group = { static struct attribute *ad7992_device_attrs[] = { &iio_dev_attr_in0_raw.dev_attr.attr, &iio_dev_attr_in1_raw.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, NULL }; @@ -510,7 +497,6 @@ static struct attribute *ad7997_8_device_attrs[] = { &iio_dev_attr_in5_raw.dev_attr.attr, &iio_dev_attr_in6_raw.dev_attr.attr, &iio_dev_attr_in7_raw.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, &iio_dev_attr_in_scale.dev_attr.attr, NULL }; diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c index 9b2a8ec750a..2ade48537e9 100644 --- a/drivers/staging/iio/adc/adt7310.c +++ b/drivers/staging/iio/adc/adt7310.c @@ -79,7 +79,6 @@ */ struct adt7310_chip_info { - const char *name; struct spi_device *spi_dev; struct iio_dev *indio_dev; u8 config; @@ -375,24 +374,12 @@ static ssize_t adt7310_show_value(struct device *dev, static IIO_DEVICE_ATTR(value, S_IRUGO, adt7310_show_value, NULL, 0); -static ssize_t adt7310_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct adt7310_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, adt7310_show_name, NULL, 0); - static struct attribute *adt7310_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_resolution.dev_attr.attr, &iio_dev_attr_id.dev_attr.attr, &iio_dev_attr_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -781,7 +768,6 @@ static int __devinit adt7310_probe(struct spi_device *spi_dev) dev_set_drvdata(&spi_dev->dev, chip); chip->spi_dev = spi_dev; - chip->name = spi_dev->modalias; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { @@ -790,6 +776,7 @@ static int __devinit adt7310_probe(struct spi_device *spi_dev) } chip->indio_dev->dev.parent = &spi_dev->dev; + chip->indio_dev->name = spi_get_device_id(spi_dev)->name; chip->indio_dev->attrs = &adt7310_attribute_group; chip->indio_dev->event_attrs = adt7310_event_attribute_group; chip->indio_dev->dev_data = (void *)chip; @@ -811,7 +798,7 @@ static int __devinit adt7310_probe(struct spi_device *spi_dev) NULL, &adt7310_event_handler, irq_flags, - chip->name, + chip->indio_dev->name, chip->indio_dev); if (ret) goto error_unreg_dev; @@ -823,7 +810,7 @@ static int __devinit adt7310_probe(struct spi_device *spi_dev) NULL, &adt7310_event_handler, adt7310_platform_data[1], - chip->name, + chip->indio_dev->name, chip->indio_dev); if (ret) goto error_unreg_ct_irq; @@ -852,7 +839,7 @@ static int __devinit adt7310_probe(struct spi_device *spi_dev) } dev_info(&spi_dev->dev, "%s temperature sensor registered.\n", - chip->name); + chip->indio_dev->name); return 0; diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c index dc591308d29..c102b42e94f 100644 --- a/drivers/staging/iio/adc/adt7410.c +++ b/drivers/staging/iio/adc/adt7410.c @@ -74,7 +74,6 @@ */ struct adt7410_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; u8 config; @@ -343,24 +342,12 @@ static ssize_t adt7410_show_value(struct device *dev, static IIO_DEVICE_ATTR(value, S_IRUGO, adt7410_show_value, NULL, 0); -static ssize_t adt7410_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct adt7410_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, adt7410_show_name, NULL, 0); - static struct attribute *adt7410_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_resolution.dev_attr.attr, &iio_dev_attr_id.dev_attr.attr, &iio_dev_attr_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -748,14 +735,13 @@ static int __devinit adt7410_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { ret = -ENOMEM; goto error_free_chip; } - + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->attrs = &adt7410_attribute_group; chip->indio_dev->event_attrs = adt7410_event_attribute_group; @@ -774,7 +760,7 @@ static int __devinit adt7410_probe(struct i2c_client *client, NULL, &adt7410_event_handler, IRQF_TRIGGER_LOW, - chip->name, + id->name, chip->indio_dev); if (ret) goto error_unreg_dev; @@ -786,7 +772,7 @@ static int __devinit adt7410_probe(struct i2c_client *client, NULL, &adt7410_event_handler, adt7410_platform_data[1], - chip->name, + id->name, chip->indio_dev); if (ret) goto error_unreg_ct_irq; diff --git a/drivers/staging/iio/adc/adt75.c b/drivers/staging/iio/adc/adt75.c index 0d1cc752693..4b1c0fa73a8 100644 --- a/drivers/staging/iio/adc/adt75.c +++ b/drivers/staging/iio/adc/adt75.c @@ -50,7 +50,6 @@ */ struct adt75_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; u8 config; @@ -243,23 +242,11 @@ static ssize_t adt75_show_value(struct device *dev, static IIO_DEVICE_ATTR(value, S_IRUGO, adt75_show_value, NULL, 0); -static ssize_t adt75_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct adt75_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, adt75_show_name, NULL, 0); - static struct attribute *adt75_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_oneshot.dev_attr.attr, &iio_dev_attr_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -563,7 +550,6 @@ static int __devinit adt75_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { @@ -571,6 +557,7 @@ static int __devinit adt75_probe(struct i2c_client *client, goto error_free_chip; } + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; chip->indio_dev->attrs = &adt75_attribute_group; chip->indio_dev->event_attrs = &adt75_event_attribute_group; @@ -588,7 +575,7 @@ static int __devinit adt75_probe(struct i2c_client *client, NULL, &adt75_event_handler, IRQF_TRIGGER_LOW, - chip->name, + chip->indio_dev->name, chip->indio_dev); if (ret) goto error_unreg_dev; @@ -610,7 +597,7 @@ static int __devinit adt75_probe(struct i2c_client *client, } dev_info(&client->dev, "%s temperature sensor registered.\n", - id->name); + chip->indio_dev->name); return 0; error_unreg_irq: diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 935914ed361..20c6aae427f 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c @@ -244,16 +244,6 @@ static int max1363_read_raw(struct iio_dev *indio_dev, return 0; } -static ssize_t max1363_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct max1363_state *st = iio_priv(dev_get_drvdata(dev)); - return sprintf(buf, "%s\n", st->client->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, max1363_show_name, NULL, 0); - /* Applies to max1363 */ static const enum max1363_modes max1363_mode_list[] = { _s0, _s1, _s2, _s3, @@ -333,15 +323,6 @@ static struct iio_chan_spec max1036_channels[] = MAX1363_4X_CHANS(8); static struct iio_chan_spec max1136_channels[] = MAX1363_4X_CHANS(10); static struct iio_chan_spec max1236_channels[] = MAX1363_4X_CHANS(12); -static struct attribute *max1363_device_attrs[] = { - &iio_dev_attr_name.dev_attr.attr, - NULL -}; - -static struct attribute_group max1363_dev_attr_group = { - .attrs = max1363_device_attrs, -}; - /* Appies to max1236, max1237 */ static const enum max1363_modes max1236_mode_list[] = { _s0, _s1, _s2, _s3, @@ -1187,7 +1168,7 @@ static int __devinit max1363_probe(struct i2c_client *client, .modemask; /* Estabilish that the iio_dev is a child of the i2c device */ indio_dev->dev.parent = &client->dev; - indio_dev->attrs = &max1363_dev_attr_group; + indio_dev->name = id->name; indio_dev->read_event_value = &max1363_read_thresh; indio_dev->write_event_value = &max1363_write_thresh; indio_dev->read_event_config = &max1363_read_event_config; -- cgit v1.2.3-70-g09d2