OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2018-01-23 11:24:08 +01:00
parent ca35910a1b
commit 6453f53b75
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/usb/atm/cxacru.c
View File

@ -196,18 +196,16 @@ static void cxacru_poll_status(struct work_struct *work);
/* Card info exported through sysfs */ /* Card info exported through sysfs */
#define CXACRU__ATTR_INIT(_name) \ #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) \ #define CXACRU_CMD_INIT(_name) \
static DEVICE_ATTR(_name, S_IWUSR | S_IRUGO, \ static DEVICE_ATTR_RW(_name)
cxacru_sysfs_show_##_name, cxacru_sysfs_store_##_name)
#define CXACRU_SET_INIT(_name) \ #define CXACRU_SET_INIT(_name) \
static DEVICE_ATTR(_name, S_IWUSR, \ static DEVICE_ATTR_WO(_name)
NULL, cxacru_sysfs_store_##_name)
#define CXACRU_ATTR_INIT(_value, _type, _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 device_attribute *attr, char *buf) \
{ \ { \
struct cxacru_data *instance = to_usbatm_driver_data(\ 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 * MAC_ADDRESS_LOW = 0x33221100
* Where 00-55 are bytes 0-5 of the MAC. * 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 device_attribute *attr, char *buf)
{ {
struct cxacru_data *instance = to_usbatm_driver_data( 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); 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) struct device_attribute *attr, char *buf)
{ {
static char *str[] = { "running", "stopped" }; 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]); 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 device_attribute *attr, const char *buf, size_t count)
{ {
struct cxacru_data *instance = to_usbatm_driver_data( 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 */ /* 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 device_attribute *attr, const char *buf, size_t count)
{ {
struct cxacru_data *instance = to_usbatm_driver_data( struct cxacru_data *instance = to_usbatm_driver_data(

4
drivers/usb/atm/ueagle-atm.c
View File

@ -2412,7 +2412,7 @@ static DEVICE_ATTR_RO(stat_delin);
#define UEA_ATTR(name, reset) \ #define UEA_ATTR(name, reset) \
\ \
static ssize_t read_##name(struct device *dev, \ static ssize_t stat_##name##_show(struct device *dev, \
struct device_attribute *attr, char *buf) \ struct device_attribute *attr, char *buf) \
{ \ { \
int ret = -ENODEV; \ int ret = -ENODEV; \
@ -2430,7 +2430,7 @@ out: \
return ret; \ return ret; \
} \ } \
\ \
static DEVICE_ATTR(stat_##name, S_IRUGO, read_##name, NULL) static DEVICE_ATTR_RO(stat_##name)
UEA_ATTR(mflags, 1); UEA_ATTR(mflags, 1);
UEA_ATTR(vidcpe, 0); UEA_ATTR(vidcpe, 0);