diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-23 11:24:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-24 08:49:52 +0100 |
| commit | 7f26ee4b56496f1bec4672cfe4e1c4808fb7e81f (patch) | |
| tree | 664036f738bb71f19b8fccc2cf88fab060fdb0f8 /drivers/usb/phy | |
| parent | ed5bd7a47fd77166860e39f857ae8e3fe25c836c (diff) | |
| download | linux-7f26ee4b56496f1bec4672cfe4e1c4808fb7e81f.tar.bz2 | |
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 <joe@perches.com>
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Cc: Oliver Neukum <oneukum@suse.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-tahvo.c | 4 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-twl6030-usb.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c index 7f7c5c82420d..0981abc3d1ad 100644 --- a/drivers/usb/phy/phy-tahvo.c +++ b/drivers/usb/phy/phy-tahvo.c @@ -59,13 +59,13 @@ static const unsigned int tahvo_cable[] = { EXTCON_NONE, }; -static ssize_t vbus_state_show(struct device *device, +static ssize_t vbus_show(struct device *device, struct device_attribute *attr, char *buf) { struct tahvo_usb *tu = dev_get_drvdata(device); return sprintf(buf, "%s\n", tu->vbus_state ? "on" : "off"); } -static DEVICE_ATTR(vbus, 0444, vbus_state_show, NULL); +static DEVICE_ATTR_RO(vbus); static void check_vbus_state(struct tahvo_usb *tu) { diff --git a/drivers/usb/phy/phy-twl6030-usb.c b/drivers/usb/phy/phy-twl6030-usb.c index e78ed52339e6..183550b63faa 100644 --- a/drivers/usb/phy/phy-twl6030-usb.c +++ b/drivers/usb/phy/phy-twl6030-usb.c @@ -168,7 +168,7 @@ static int twl6030_usb_ldo_init(struct twl6030_usb *twl) return 0; } -static ssize_t twl6030_usb_vbus_show(struct device *dev, +static ssize_t vbus_show(struct device *dev, struct device_attribute *attr, char *buf) { struct twl6030_usb *twl = dev_get_drvdata(dev); @@ -194,7 +194,7 @@ static ssize_t twl6030_usb_vbus_show(struct device *dev, return ret; } -static DEVICE_ATTR(vbus, 0444, twl6030_usb_vbus_show, NULL); +static DEVICE_ATTR_RO(vbus); static irqreturn_t twl6030_usb_irq(int irq, void *_twl) { |