From 7f26ee4b56496f1bec4672cfe4e1c4808fb7e81f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Jan 2018 11:24:06 +0100 Subject: USB: move many drivers to use DEVICE_ATTR_RO Instead of "open coding" a DEVICE_ATTR() define, use the DEVICE_ATTR_RO() 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: Oliver Neukum Acked-by: Alan Stern Acked-by: Felipe Balbi Acked-by: Pete Zaitcev Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/sierra_ms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/usb/storage') diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c index daf62448483f..6ac60abd2e15 100644 --- a/drivers/usb/storage/sierra_ms.c +++ b/drivers/usb/storage/sierra_ms.c @@ -90,7 +90,7 @@ static void debug_swoc(const struct device *dev, struct swoc_info *swocInfo) } -static ssize_t show_truinst(struct device *dev, struct device_attribute *attr, +static ssize_t truinst_show(struct device *dev, struct device_attribute *attr, char *buf) { struct swoc_info *swocInfo; @@ -122,7 +122,7 @@ static ssize_t show_truinst(struct device *dev, struct device_attribute *attr, } return result; } -static DEVICE_ATTR(truinst, S_IRUGO, show_truinst, NULL); +static DEVICE_ATTR_RO(truinst); int sierra_ms_init(struct us_data *us) { -- cgit