mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
Staging: iio: fix duplicate dev_attr_name
device attr's should be static, otherwise duplicate identifiers are created: drivers/staging/iio/trigger/iio-trig-gpio.o:(.data+0x1c): multiple definition of `dev_attr_name' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
3860dc82e6
commit
2fdec57610
3 changed files with 4 additions and 4 deletions
|
@ -441,7 +441,7 @@ static int lis3l02dq_data_rdy_trigger_set_state(struct iio_trigger *trig,
|
|||
&t);
|
||||
return ret;
|
||||
}
|
||||
DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
|
||||
static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
|
||||
|
||||
static struct attribute *lis3l02dq_trigger_attrs[] = {
|
||||
&dev_attr_name.attr,
|
||||
|
|
|
@ -46,7 +46,7 @@ static irqreturn_t iio_gpio_trigger_poll(int irq, void *private)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
|
||||
static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
|
||||
|
||||
static struct attribute *iio_gpio_trigger_attrs[] = {
|
||||
&dev_attr_name.attr,
|
||||
|
|
|
@ -81,10 +81,10 @@ static ssize_t iio_trig_periodic_read_name(struct device *dev,
|
|||
return sprintf(buf, "%s\n", trig_info->name);
|
||||
}
|
||||
|
||||
DEVICE_ATTR(name, S_IRUGO,
|
||||
static DEVICE_ATTR(name, S_IRUGO,
|
||||
iio_trig_periodic_read_name,
|
||||
NULL);
|
||||
DEVICE_ATTR(frequency, S_IRUGO | S_IWUSR,
|
||||
static DEVICE_ATTR(frequency, S_IRUGO | S_IWUSR,
|
||||
iio_trig_periodic_read_freq,
|
||||
iio_trig_periodic_write_freq);
|
||||
|
||||
|
|
Loading…
Reference in a new issue