iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390: drivers: convert to use DRIVER_ATTR_RO/WO

Browse Source 
We are trying to get rid of DRIVER_ATTR(), and the s390 drivers'
attributes can be trivially changed to use DRIVER_ATTR_RO() and
DRIVER_ATTR_WO().

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Cc: Ursula Braun <ubraun@linux.vnet.ibm.com>
Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: <linux-s390@vger.kernel.org>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2017-06-09 11:03:13 +02:00
parent ac3054c4f6
commit 36369569ad
6 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/s390/char/sclp.c
View File

@ -1096,26 +1096,26 @@ static const struct dev_pm_ops sclp_pm_ops = {
.restore = sclp_restore, .restore = sclp_restore,
}; };
static ssize_t sclp_show_console_pages(struct device_driver *dev, char *buf) static ssize_t con_pages_show(struct device_driver *dev, char *buf)
{ {
return sprintf(buf, "%i\n", sclp_console_pages); return sprintf(buf, "%i\n", sclp_console_pages);
} }
static DRIVER_ATTR(con_pages, S_IRUSR, sclp_show_console_pages, NULL); static DRIVER_ATTR_RO(con_pages);
static ssize_t sclp_show_con_drop(struct device_driver *dev, char *buf) static ssize_t con_drop_show(struct device_driver *dev, char *buf)
{ {
return sprintf(buf, "%i\n", sclp_console_drop); return sprintf(buf, "%i\n", sclp_console_drop);
} }
static DRIVER_ATTR(con_drop, S_IRUSR, sclp_show_con_drop, NULL); static DRIVER_ATTR_RO(con_drop);
static ssize_t sclp_show_console_full(struct device_driver *dev, char *buf) static ssize_t con_full_show(struct device_driver *dev, char *buf)
{ {
return sprintf(buf, "%lu\n", sclp_console_full); return sprintf(buf, "%lu\n", sclp_console_full);
} }
static DRIVER_ATTR(con_full, S_IRUSR, sclp_show_console_full, NULL); static DRIVER_ATTR_RO(con_full);
static struct attribute *sclp_drv_attrs[] = { static struct attribute *sclp_drv_attrs[] = {
&driver_attr_con_pages.attr, &driver_attr_con_pages.attr,

7
drivers/s390/char/vmlogrdr.c
View File

@ -641,10 +641,8 @@ static ssize_t vmlogrdr_recording_store(struct device * dev,
static DEVICE_ATTR(recording, 0200, NULL, vmlogrdr_recording_store); static DEVICE_ATTR(recording, 0200, NULL, vmlogrdr_recording_store);
static ssize_t vmlogrdr_recording_status_show(struct device_driver *driver, static ssize_t recording_status_show(struct device_driver *driver, char *buf)
char *buf)
{ {
static const char cp_command[] = "QUERY RECORDING "; static const char cp_command[] = "QUERY RECORDING ";
int len; int len;
@ -652,8 +650,7 @@ static ssize_t vmlogrdr_recording_status_show(struct device_driver *driver,
len = strlen(buf); len = strlen(buf);
return len; return len;
} }
static DRIVER_ATTR(recording_status, 0444, vmlogrdr_recording_status_show, static DRIVER_ATTR_RO(recording_status);
NULL);
static struct attribute *vmlogrdr_drv_attrs[] = { static struct attribute *vmlogrdr_drv_attrs[] = {
&driver_attr_recording_status.attr, &driver_attr_recording_status.attr,
NULL, NULL,

6
drivers/s390/net/ctcm_main.c
View File

@ -1770,15 +1770,15 @@ static struct ccwgroup_driver ctcm_group_driver = {
.restore = ctcm_pm_resume, .restore = ctcm_pm_resume,
}; };
static ssize_t ctcm_driver_group_store(struct device_driver *ddrv, static ssize_t group_store(struct device_driver *ddrv, const char *buf,
const char *buf, size_t count) size_t count)
{ {
int err; int err;
err = ccwgroup_create_dev(ctcm_root_dev, &ctcm_group_driver, 2, buf); err = ccwgroup_create_dev(ctcm_root_dev, &ctcm_group_driver, 2, buf);
return err ? err : count; return err ? err : count;
} }
static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store); static DRIVER_ATTR_WO(group);
static struct attribute *ctcm_drv_attrs[] = { static struct attribute *ctcm_drv_attrs[] = {
&driver_attr_group.attr, &driver_attr_group.attr,

6
drivers/s390/net/lcs.c
View File

@ -2411,14 +2411,14 @@ static struct ccwgroup_driver lcs_group_driver = {
.restore = lcs_restore, .restore = lcs_restore,
}; };
static ssize_t lcs_driver_group_store(struct device_driver *ddrv, static ssize_t group_store(struct device_driver *ddrv, const char *buf,
const char *buf, size_t count) size_t count)
{ {
int err; int err;
err = ccwgroup_create_dev(lcs_root_dev, &lcs_group_driver, 2, buf); err = ccwgroup_create_dev(lcs_root_dev, &lcs_group_driver, 2, buf);
return err ? err : count; return err ? err : count;
} }
static DRIVER_ATTR(group, 0200, NULL, lcs_driver_group_store); static DRIVER_ATTR_WO(group);
static struct attribute *lcs_drv_attrs[] = { static struct attribute *lcs_drv_attrs[] = {
&driver_attr_group.attr, &driver_attr_group.attr,

14
drivers/s390/net/netiucv.c
View File

@ -2020,8 +2020,8 @@ out_netdev:
return NULL; return NULL;
} }
static ssize_t conn_write(struct device_driver *drv, static ssize_t connection_store(struct device_driver *drv, const char *buf,
const char *buf, size_t count) size_t count)
{ {
char username[9]; char username[9];
char userdata[17]; char userdata[17];
@ -2082,11 +2082,10 @@ out_free_ndev:
netiucv_free_netdevice(dev); netiucv_free_netdevice(dev);
return rc; return rc;
} }
static DRIVER_ATTR_WO(connection);
static DRIVER_ATTR(connection, 0200, NULL, conn_write); static ssize_t remove_store(struct device_driver *drv, const char *buf,
size_t count)
static ssize_t remove_write (struct device_driver *drv,
const char *buf, size_t count)
{ {
struct iucv_connection *cp; struct iucv_connection *cp;
struct net_device *ndev; struct net_device *ndev;
@ -2132,8 +2131,7 @@ static ssize_t remove_write (struct device_driver *drv,
IUCV_DBF_TEXT(data, 2, "remove_write: unknown device\n"); IUCV_DBF_TEXT(data, 2, "remove_write: unknown device\n");
return -EINVAL; return -EINVAL;
} }
static DRIVER_ATTR_WO(remove);
static DRIVER_ATTR(remove, 0200, NULL, remove_write);
static struct attribute * netiucv_drv_attrs[] = { static struct attribute * netiucv_drv_attrs[] = {
&driver_attr_connection.attr, &driver_attr_connection.attr,

6
drivers/s390/net/qeth_core_main.c
View File

@ -5800,8 +5800,8 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = {
.restore = qeth_core_restore, .restore = qeth_core_restore,
}; };
static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv, static ssize_t group_store(struct device_driver *ddrv, const char *buf,
const char *buf, size_t count) size_t count)
{ {
int err; int err;
@ -5810,7 +5810,7 @@ static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv,
return err ? err : count; return err ? err : count;
} }
static DRIVER_ATTR(group, 0200, NULL, qeth_core_driver_group_store); static DRIVER_ATTR_WO(group);
static struct attribute *qeth_drv_attrs[] = { static struct attribute *qeth_drv_attrs[] = {
&driver_attr_group.attr, &driver_attr_group.attr,