diff options
Diffstat (limited to 'drivers/staging/iio/adc/adt7410.c')
-rw-r--r-- | drivers/staging/iio/adc/adt7410.c | 20 |
1 files changed, 3 insertions, 17 deletions
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; |