Input: ad7877 - use attribute group to control visibility of attributes
Instead of manually creating one set of attributes or another set up is_visible method in attribute group structure to control whether aux3 or gpio3 attribute is presented to userspace. Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
fc58d12be4
commit
2fd18abad1
|
@ -206,8 +206,8 @@ struct ad7877 {
|
|||
u16 conversion_data[AD7877_NR_SENSE] ____cacheline_aligned;
|
||||
};
|
||||
|
||||
static int gpio3;
|
||||
module_param(gpio3, int, 0);
|
||||
static bool gpio3;
|
||||
module_param(gpio3, bool, 0);
|
||||
MODULE_PARM_DESC(gpio3, "If gpio3 is set to 1 AUX3 acts as GPIO3");
|
||||
|
||||
/*
|
||||
|
@ -615,15 +615,34 @@ static struct attribute *ad7877_attributes[] = {
|
|||
&dev_attr_temp2.attr,
|
||||
&dev_attr_aux1.attr,
|
||||
&dev_attr_aux2.attr,
|
||||
&dev_attr_aux3.attr,
|
||||
&dev_attr_bat1.attr,
|
||||
&dev_attr_bat2.attr,
|
||||
&dev_attr_disable.attr,
|
||||
&dev_attr_dac.attr,
|
||||
&dev_attr_gpio3.attr,
|
||||
&dev_attr_gpio4.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static mode_t ad7877_attr_is_visible(struct kobject *kobj,
|
||||
struct attribute *attr, int n)
|
||||
{
|
||||
mode_t mode = attr->mode;
|
||||
|
||||
if (attr == &dev_attr_aux3.attr) {
|
||||
if (gpio3)
|
||||
mode = 0;
|
||||
} else if (attr == &dev_attr_gpio3.attr) {
|
||||
if (!gpio3)
|
||||
mode = 0;
|
||||
}
|
||||
|
||||
return mode;
|
||||
}
|
||||
|
||||
static const struct attribute_group ad7877_attr_group = {
|
||||
.is_visible = ad7877_attr_is_visible,
|
||||
.attrs = ad7877_attributes,
|
||||
};
|
||||
|
||||
|
@ -787,20 +806,12 @@ static int __devinit ad7877_probe(struct spi_device *spi)
|
|||
if (err)
|
||||
goto err_free_irq;
|
||||
|
||||
err = device_create_file(&spi->dev,
|
||||
gpio3 ? &dev_attr_gpio3 : &dev_attr_aux3);
|
||||
err = input_register_device(input_dev);
|
||||
if (err)
|
||||
goto err_remove_attr_group;
|
||||
|
||||
err = input_register_device(input_dev);
|
||||
if (err)
|
||||
goto err_remove_attr;
|
||||
|
||||
return 0;
|
||||
|
||||
err_remove_attr:
|
||||
device_remove_file(&spi->dev,
|
||||
gpio3 ? &dev_attr_gpio3 : &dev_attr_aux3);
|
||||
err_remove_attr_group:
|
||||
sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
|
||||
err_free_irq:
|
||||
|
@ -817,8 +828,6 @@ static int __devexit ad7877_remove(struct spi_device *spi)
|
|||
struct ad7877 *ts = dev_get_drvdata(&spi->dev);
|
||||
|
||||
sysfs_remove_group(&spi->dev.kobj, &ad7877_attr_group);
|
||||
device_remove_file(&spi->dev,
|
||||
gpio3 ? &dev_attr_gpio3 : &dev_attr_aux3);
|
||||
|
||||
ad7877_disable(ts);
|
||||
free_irq(ts->spi->irq, ts);
|
||||
|
|
Loading…
Reference in New Issue