Commit 3fd3c0a5 authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files

[PATCH] Driver Core: drivers/char/raw3270.c - drivers/net/netiucv.c: update... 


[PATCH] Driver Core: drivers/char/raw3270.c - drivers/net/netiucv.c: update device attribute callbacks

Signed-off-by: default avatarYani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e404e274

drivers/s390/char/raw3270.c

+3 −3
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ raw3270_probe (struct ccw_device *cdev) 
 * Additional attributes for a 3270 device

 */

static ssize_t

raw3270_model_show(struct device *dev, char *buf)

raw3270_model_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%i\n",

			((struct raw3270 *) dev->driver_data)->model);
@@ -1092,7 +1092,7 @@ raw3270_model_show(struct device *dev, char *buf) 
static DEVICE_ATTR(model, 0444, raw3270_model_show, 0);



static ssize_t

raw3270_rows_show(struct device *dev, char *buf)

raw3270_rows_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%i\n",

			((struct raw3270 *) dev->driver_data)->rows);
@@ -1100,7 +1100,7 @@ raw3270_rows_show(struct device *dev, char *buf) 
static DEVICE_ATTR(rows, 0444, raw3270_rows_show, 0);



static ssize_t

raw3270_columns_show(struct device *dev, char *buf)

raw3270_columns_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%i\n",

			((struct raw3270 *) dev->driver_data)->cols);

drivers/s390/char/tape_core.c

+5 −5
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ busid_to_int(char *bus_id) 
 *        replaced by a link to the cdev tree.

 */

static ssize_t

tape_medium_state_show(struct device *dev, char *buf)

tape_medium_state_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct tape_device *tdev;
@@ -119,7 +119,7 @@ static 
DEVICE_ATTR(medium_state, 0444, tape_medium_state_show, NULL);



static ssize_t

tape_first_minor_show(struct device *dev, char *buf)

tape_first_minor_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct tape_device *tdev;
@@ -131,7 +131,7 @@ static 
DEVICE_ATTR(first_minor, 0444, tape_first_minor_show, NULL);



static ssize_t

tape_state_show(struct device *dev, char *buf)

tape_state_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct tape_device *tdev;
@@ -144,7 +144,7 @@ static 
DEVICE_ATTR(state, 0444, tape_state_show, NULL);



static ssize_t

tape_operation_show(struct device *dev, char *buf)

tape_operation_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct tape_device *tdev;

	ssize_t rc;
@@ -171,7 +171,7 @@ static 
DEVICE_ATTR(operation, 0444, tape_operation_show, NULL);



static ssize_t

tape_blocksize_show(struct device *dev, char *buf)

tape_blocksize_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct tape_device *tdev;

drivers/s390/char/vmlogrdr.c

+6 −6
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ vmlogrdr_read (struct file *filp, char *data, size_t count, loff_t * ppos) 
}



static ssize_t

vmlogrdr_autopurge_store(struct device * dev, const char * buf, size_t count) {

vmlogrdr_autopurge_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {

	struct vmlogrdr_priv_t *priv = dev->driver_data;

	ssize_t ret = count;
@@ -567,7 +567,7 @@ vmlogrdr_autopurge_store(struct device * dev, const char * buf, size_t count) { 




static ssize_t

vmlogrdr_autopurge_show(struct device *dev, char *buf) {

vmlogrdr_autopurge_show(struct device *dev, struct device_attribute *attr, char *buf) {

	struct vmlogrdr_priv_t *priv = dev->driver_data;

	return sprintf(buf, "%u\n", priv->autopurge);

}
@@ -578,7 +578,7 @@ static DEVICE_ATTR(autopurge, 0644, vmlogrdr_autopurge_show, 




static ssize_t

vmlogrdr_purge_store(struct device * dev, const char * buf, size_t count) {

vmlogrdr_purge_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {



	char cp_command[80];

	char cp_response[80];
@@ -619,7 +619,7 @@ static DEVICE_ATTR(purge, 0200, NULL, vmlogrdr_purge_store); 




static ssize_t

vmlogrdr_autorecording_store(struct device *dev, const char *buf,

vmlogrdr_autorecording_store(struct device *dev, struct device_attribute *attr, const char *buf,

			     size_t count) {

	struct vmlogrdr_priv_t *priv = dev->driver_data;

	ssize_t ret = count;
@@ -639,7 +639,7 @@ vmlogrdr_autorecording_store(struct device *dev, const char *buf, 




static ssize_t

vmlogrdr_autorecording_show(struct device *dev, char *buf) {

vmlogrdr_autorecording_show(struct device *dev, struct device_attribute *attr, char *buf) {

	struct vmlogrdr_priv_t *priv = dev->driver_data;

	return sprintf(buf, "%u\n", priv->autorecording);

}
@@ -650,7 +650,7 @@ static DEVICE_ATTR(autorecording, 0644, vmlogrdr_autorecording_show, 




static ssize_t

vmlogrdr_recording_store(struct device * dev, const char * buf, size_t count) {

vmlogrdr_recording_store(struct device * dev, struct device_attribute *attr, const char * buf, size_t count) {



	struct vmlogrdr_priv_t *priv = dev->driver_data;

	ssize_t ret;

drivers/s390/cio/ccwgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev) 
 * longer needed or accidentially created. Saves memory :)

 */

static ssize_t

ccwgroup_ungroup_store(struct device *dev, const char *buf, size_t count)

ccwgroup_ungroup_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	struct ccwgroup_device *gdev;
@@ -310,7 +310,7 @@ ccwgroup_set_offline(struct ccwgroup_device *gdev) 
}



static ssize_t

ccwgroup_online_store (struct device *dev, const char *buf, size_t count)

ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	struct ccwgroup_device *gdev;

	struct ccwgroup_driver *gdrv;
@@ -338,7 +338,7 @@ ccwgroup_online_store (struct device *dev, const char *buf, size_t count) 
}



static ssize_t

ccwgroup_online_show (struct device *dev, char *buf)

ccwgroup_online_show (struct device *dev, struct device_attribute *attr, char *buf)

{

	int online;

drivers/s390/cio/chsc.c

+3 −3
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ s390_vary_chpid( __u8 chpid, int on) 
 * Files for the channel path entries.

 */

static ssize_t

chp_status_show(struct device *dev, char *buf)

chp_status_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct channel_path *chp = container_of(dev, struct channel_path, dev);
@@ -863,7 +863,7 @@ chp_status_show(struct device *dev, char *buf) 
}



static ssize_t

chp_status_write(struct device *dev, const char *buf, size_t count)

chp_status_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)

{

	struct channel_path *cp = container_of(dev, struct channel_path, dev);

	char cmd[10];
@@ -888,7 +888,7 @@ chp_status_write(struct device *dev, const char *buf, size_t count) 
static DEVICE_ATTR(status, 0644, chp_status_show, chp_status_write);



static ssize_t

chp_type_show(struct device *dev, char *buf)

chp_type_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct channel_path *chp = container_of(dev, struct channel_path, dev);