From ed5bd7a47fd77166860e39f857ae8e3fe25c836c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Jan 2018 11:24:05 +0100 Subject: USB: move many drivers to use DEVICE_ATTR_RW Instead of "open coding" a DEVICE_ATTR() define, use the DEVICE_ATTR_RW() macro instead, which does everything properly instead. This does require a few static functions to be renamed to work properly, but thanks to a script from Joe Perches, this was easily done. Reported-by: Joe Perches Cc: Matthieu CASTET Cc: Stanislaw Gruszka Cc: Peter Chen Cc: Mathias Nyman Acked-by: Felipe Balbi Acked-by: Alan Stern Acked-by: Bin Liu Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/usbsevseg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/usb/misc/usbsevseg.c') diff --git a/drivers/usb/misc/usbsevseg.c b/drivers/usb/misc/usbsevseg.c index 12f7e94695a2..793f6c498d5c 100644 --- a/drivers/usb/misc/usbsevseg.c +++ b/drivers/usb/misc/usbsevseg.c @@ -187,7 +187,7 @@ static ssize_t set_attr_##name(struct device *dev, \ } \ static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_attr_##name, set_attr_##name); -static ssize_t show_attr_text(struct device *dev, +static ssize_t text_show(struct device *dev, struct device_attribute *attr, char *buf) { struct usb_interface *intf = to_usb_interface(dev); @@ -196,7 +196,7 @@ static ssize_t show_attr_text(struct device *dev, return snprintf(buf, mydev->textlength, "%s\n", mydev->text); } -static ssize_t set_attr_text(struct device *dev, +static ssize_t text_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct usb_interface *intf = to_usb_interface(dev); @@ -216,9 +216,9 @@ static ssize_t set_attr_text(struct device *dev, return count; } -static DEVICE_ATTR(text, S_IRUGO | S_IWUSR, show_attr_text, set_attr_text); +static DEVICE_ATTR_RW(text); -static ssize_t show_attr_decimals(struct device *dev, +static ssize_t decimals_show(struct device *dev, struct device_attribute *attr, char *buf) { struct usb_interface *intf = to_usb_interface(dev); @@ -240,7 +240,7 @@ static ssize_t show_attr_decimals(struct device *dev, return sizeof(mydev->decimals) + 1; } -static ssize_t set_attr_decimals(struct device *dev, +static ssize_t decimals_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct usb_interface *intf = to_usb_interface(dev); @@ -265,9 +265,9 @@ static ssize_t set_attr_decimals(struct device *dev, return count; } -static DEVICE_ATTR(decimals, S_IRUGO | S_IWUSR, show_attr_decimals, set_attr_decimals); +static DEVICE_ATTR_RW(decimals); -static ssize_t show_attr_textmode(struct device *dev, +static ssize_t textmode_show(struct device *dev, struct device_attribute *attr, char *buf) { struct usb_interface *intf = to_usb_interface(dev); @@ -293,7 +293,7 @@ static ssize_t show_attr_textmode(struct device *dev, return strlen(buf); } -static ssize_t set_attr_textmode(struct device *dev, +static ssize_t textmode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct usb_interface *intf = to_usb_interface(dev); @@ -309,7 +309,7 @@ static ssize_t set_attr_textmode(struct device *dev, return count; } -static DEVICE_ATTR(textmode, S_IRUGO | S_IWUSR, show_attr_textmode, set_attr_textmode); +static DEVICE_ATTR_RW(textmode); MYDEV_ATTR_SIMPLE_UNSIGNED(powered, update_display_powered); -- cgit v1.2.1