Commit 3bda058b authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[S390] ccw_driver: remove duplicate members 



Remove the owner and name members of struct
ccw_driver and convert all drivers to store
this data in the embedded struct device_driver.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9a26513e

arch/s390/include/asm/ccwdev.h

+0 −4
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ enum uc_todo { 


/**

 * struct ccw driver - device driver for channel attached devices

 * @owner: owning module

 * @ids: ids supported by this driver

 * @probe: function called on probe

 * @remove: function called on remove
@@ -128,10 +127,8 @@ enum uc_todo { 
 * @restore: callback for restoring after hibernation

 * @uc_handler: callback for unit check handler

 * @driver: embedded device driver structure

 * @name: device driver name

 */

struct ccw_driver {

	struct module *owner;

	struct ccw_device_id *ids;

	int (*probe) (struct ccw_device *);

	void (*remove) (struct ccw_device *);
@@ -147,7 +144,6 @@ struct ccw_driver { 
	int (*restore)(struct ccw_device *);

	enum uc_todo (*uc_handler) (struct ccw_device *, struct irb *);

	struct device_driver driver;

	char *name;

};



extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,

drivers/s390/block/dasd_eckd.c

+4 −2
Original line number Diff line number Diff line
@@ -3982,8 +3982,10 @@ out_err: 
}



static struct ccw_driver dasd_eckd_driver = {

	.driver = {

		.name	= "dasd-eckd",

		.owner	= THIS_MODULE,

	},

	.ids	     = dasd_eckd_ids,

	.probe	     = dasd_eckd_probe,

	.remove      = dasd_generic_remove,

drivers/s390/block/dasd_fba.c

+4 −2
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ dasd_fba_set_online(struct ccw_device *cdev) 
}



static struct ccw_driver dasd_fba_driver = {

	.driver = {

		.name	= "dasd-fba",

		.owner	= THIS_MODULE,

	},

	.ids         = dasd_fba_ids,

	.probe       = dasd_fba_probe,

	.remove      = dasd_generic_remove,

drivers/s390/char/con3215.c

+4 −2
Original line number Diff line number Diff line
@@ -764,8 +764,10 @@ static struct ccw_device_id raw3215_id[] = { 
};



static struct ccw_driver raw3215_ccw_driver = {

	.driver = {

		.name	= "3215",

		.owner	= THIS_MODULE,

	},

	.ids		= raw3215_id,

	.probe		= &raw3215_probe,

	.remove		= &raw3215_remove,

drivers/s390/char/raw3270.c

+4 −2
Original line number Diff line number Diff line
@@ -1388,8 +1388,10 @@ static struct ccw_device_id raw3270_id[] = { 
};



static struct ccw_driver raw3270_ccw_driver = {

	.driver = {

		.name	= "3270",

		.owner	= THIS_MODULE,

	},

	.ids		= raw3270_id,

	.probe		= &raw3270_probe,

	.remove		= &raw3270_remove,

CRA Git | Maintained and supported by SUSTech CRA and CCSE