diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-30 15:37:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-30 15:37:22 +0100 |
| commit | 946cb48082b0bbff0bb96b3f816d0327bf409d79 (patch) | |
| tree | ddf24fb1cffad74877ccd6d4c3421cf8e6cc5bb8 /d11.patch | |
| parent | 3c37d678907cad7f656ff2d3f1d7d9781cf90b58 (diff) | |
| download | patches-946cb48082b0bbff0bb96b3f816d0327bf409d79.tar.gz | |
more patches updated
Diffstat (limited to 'd11.patch')
| -rw-r--r-- | d11.patch | 147 |
1 files changed, 147 insertions, 0 deletions
diff --git a/d11.patch b/d11.patch new file mode 100644 index 00000000000000..332e64ac370d4c --- /dev/null +++ b/d11.patch @@ -0,0 +1,147 @@ +--- + drivers/s390/char/sclp.c | 12 ++++++------ + drivers/s390/char/vmlogrdr.c | 7 ++----- + drivers/s390/net/lcs.c | 6 +++--- + drivers/s390/net/netiucv.c | 14 ++++++-------- + drivers/s390/net/qeth_core_main.c | 6 +++--- + 5 files changed, 20 insertions(+), 25 deletions(-) + +--- a/drivers/s390/char/sclp.c ++++ b/drivers/s390/char/sclp.c +@@ -1128,26 +1128,26 @@ static const struct dev_pm_ops sclp_pm_o + .restore = sclp_restore, + }; + +-static ssize_t sclp_show_console_pages(struct device_driver *dev, char *buf) ++static ssize_t console_pages_show(struct device_driver *dev, char *buf) + { + 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); + } + +-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); + } + +-static DRIVER_ATTR(con_full, S_IRUSR, sclp_show_console_full, NULL); ++static DRIVER_ATTR_RO(con_full); + + static struct attribute *sclp_drv_attrs[] = { + &driver_attr_con_pages.attr, +--- a/drivers/s390/char/vmlogrdr.c ++++ b/drivers/s390/char/vmlogrdr.c +@@ -641,10 +641,8 @@ static ssize_t vmlogrdr_recording_store( + static DEVICE_ATTR(recording, 0200, NULL, vmlogrdr_recording_store); + + +-static ssize_t vmlogrdr_recording_status_show(struct device_driver *driver, +- char *buf) ++static ssize_t recording_status_show(struct device_driver *driver, char *buf) + { +- + static const char cp_command[] = "QUERY RECORDING "; + int len; + +@@ -652,8 +650,7 @@ static ssize_t vmlogrdr_recording_status + len = strlen(buf); + return len; + } +-static DRIVER_ATTR(recording_status, 0444, vmlogrdr_recording_status_show, +- NULL); ++static DRIVER_ATTR_RO(recording_status); + static struct attribute *vmlogrdr_drv_attrs[] = { + &driver_attr_recording_status.attr, + NULL, +--- a/drivers/s390/net/lcs.c ++++ b/drivers/s390/net/lcs.c +@@ -2411,14 +2411,14 @@ static struct ccwgroup_driver lcs_group_ + .restore = lcs_restore, + }; + +-static ssize_t lcs_driver_group_store(struct device_driver *ddrv, +- const char *buf, size_t count) ++static ssize_t group_store(struct device_driver *ddrv, const char *buf, ++ size_t count) + { + int err; + err = ccwgroup_create_dev(lcs_root_dev, &lcs_group_driver, 2, buf); + 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[] = { + &driver_attr_group.attr, +--- a/drivers/s390/net/netiucv.c ++++ b/drivers/s390/net/netiucv.c +@@ -2041,8 +2041,8 @@ out_netdev: + return NULL; + } + +-static ssize_t conn_write(struct device_driver *drv, +- const char *buf, size_t count) ++static ssize_t connection_store(struct device_driver *drv, const char *buf, ++ size_t count) + { + char username[9]; + char userdata[17]; +@@ -2103,11 +2103,10 @@ out_free_ndev: + netiucv_free_netdevice(dev); + return rc; + } ++static DRIVER_ATTR_WO(connection); + +-static DRIVER_ATTR(connection, 0200, NULL, conn_write); +- +-static ssize_t remove_write (struct device_driver *drv, +- const char *buf, size_t count) ++static ssize_t remove_store(struct device_driver *drv, const char *buf, ++ size_t count) + { + struct iucv_connection *cp; + struct net_device *ndev; +@@ -2153,8 +2152,7 @@ static ssize_t remove_write (struct devi + IUCV_DBF_TEXT(data, 2, "remove_write: unknown device\n"); + return -EINVAL; + } +- +-static DRIVER_ATTR(remove, 0200, NULL, remove_write); ++static DRIVER_ATTR_WO(remove); + + static struct attribute * netiucv_drv_attrs[] = { + &driver_attr_connection.attr, +--- a/drivers/s390/net/qeth_core_main.c ++++ b/drivers/s390/net/qeth_core_main.c +@@ -5740,8 +5740,8 @@ static struct ccwgroup_driver qeth_core_ + .restore = qeth_core_restore, + }; + +-static ssize_t qeth_core_driver_group_store(struct device_driver *ddrv, +- const char *buf, size_t count) ++static ssize_t group_store(struct device_driver *ddrv, const char *buf, ++ size_t count) + { + int err; + +@@ -5750,7 +5750,7 @@ static ssize_t qeth_core_driver_group_st + + 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[] = { + &driver_attr_group.attr, |