diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-23 11:24:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-24 08:49:52 +0100 |
| commit | 6453f53b752af97cefdba8242466d8c19a86d4cb (patch) | |
| tree | 566a9ce0ceb8fb15ba2ab24d717fee1c9b2fb61b /drivers/usb/atm/cxacru.c | |
| parent | ca35910a1ba21e45368640ac4d884536649966d9 (diff) | |
| download | linux-6453f53b752af97cefdba8242466d8c19a86d4cb.tar.gz linux-6453f53b752af97cefdba8242466d8c19a86d4cb.tar.bz2 linux-6453f53b752af97cefdba8242466d8c19a86d4cb.zip | |
USB: atm: fix up some remaining DEVICE_ATTR() usage
There's no need to have DEVICE_ATTR() in these crazy macros, so use the
proper DEVICE_ATTR_*() versions intead.
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Stanislaw Gruszka <stf_xl@wp.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/atm/cxacru.c')
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 8af797252af2..e57a2be8754a 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c @@ -196,18 +196,16 @@ static void cxacru_poll_status(struct work_struct *work); /* Card info exported through sysfs */ #define CXACRU__ATTR_INIT(_name) \ -static DEVICE_ATTR(_name, S_IRUGO, cxacru_sysfs_show_##_name, NULL) +static DEVICE_ATTR_RO(_name) #define CXACRU_CMD_INIT(_name) \ -static DEVICE_ATTR(_name, S_IWUSR | S_IRUGO, \ - cxacru_sysfs_show_##_name, cxacru_sysfs_store_##_name) +static DEVICE_ATTR_RW(_name) #define CXACRU_SET_INIT(_name) \ -static DEVICE_ATTR(_name, S_IWUSR, \ - NULL, cxacru_sysfs_store_##_name) +static DEVICE_ATTR_WO(_name) #define CXACRU_ATTR_INIT(_value, _type, _name) \ -static ssize_t cxacru_sysfs_show_##_name(struct device *dev, \ +static ssize_t _name##_show(struct device *dev, \ struct device_attribute *attr, char *buf) \ { \ struct cxacru_data *instance = to_usbatm_driver_data(\ @@ -302,7 +300,7 @@ static ssize_t cxacru_sysfs_showattr_MODU(u32 value, char *buf) * MAC_ADDRESS_LOW = 0x33221100 * Where 00-55 are bytes 0-5 of the MAC. */ -static ssize_t cxacru_sysfs_show_mac_address(struct device *dev, +static ssize_t mac_address_show(struct device *dev, struct device_attribute *attr, char *buf) { struct cxacru_data *instance = to_usbatm_driver_data( @@ -315,7 +313,7 @@ static ssize_t cxacru_sysfs_show_mac_address(struct device *dev, instance->usbatm->atm_dev->esi); } -static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev, +static ssize_t adsl_state_show(struct device *dev, struct device_attribute *attr, char *buf) { static char *str[] = { "running", "stopped" }; @@ -332,7 +330,7 @@ static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev, return snprintf(buf, PAGE_SIZE, "%s\n", str[value]); } -static ssize_t cxacru_sysfs_store_adsl_state(struct device *dev, +static ssize_t adsl_state_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct cxacru_data *instance = to_usbatm_driver_data( @@ -435,7 +433,7 @@ static ssize_t cxacru_sysfs_store_adsl_state(struct device *dev, /* CM_REQUEST_CARD_DATA_GET times out, so no show attribute */ -static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev, +static ssize_t adsl_config_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct cxacru_data *instance = to_usbatm_driver_data( |