Commit 6fdf5392 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: don't duplicate name between vio_driver and device_driver 



Just set the name field directly in the device_driver structure
contained in the vio_driver struct.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent f38d87f5

arch/powerpc/kernel/vio.c

+1 −2
Original line number Diff line number Diff line
@@ -76,10 +76,9 @@ static int vio_bus_remove(struct device *dev) 
int vio_register_driver(struct vio_driver *viodrv)

{

	printk(KERN_DEBUG "%s: driver %s registering\n", __FUNCTION__,

		viodrv->name);

		viodrv->driver.name);



	/* fill in 'struct driver' fields */

	viodrv->driver.name = viodrv->name;

	viodrv->driver.bus = &vio_bus_type;

	viodrv->driver.probe = vio_bus_probe;

	viodrv->driver.remove = vio_bus_remove;

drivers/block/viodasd.c

+4 −2
Original line number Diff line number Diff line
@@ -781,10 +781,12 @@ static struct vio_device_id viodasd_device_table[] __devinitdata = { 


MODULE_DEVICE_TABLE(vio, viodasd_device_table);

static struct vio_driver viodasd_driver = {

	.name = "viodasd",

	.id_table = viodasd_device_table,

	.probe = viodasd_probe,

	.remove = viodasd_remove

	.remove = viodasd_remove,

	.driver = {

		.name = "viodasd",

	}

};



/*

drivers/cdrom/viocd.c

+4 −2
Original line number Diff line number Diff line
@@ -739,10 +739,12 @@ static struct vio_device_id viocd_device_table[] __devinitdata = { 


MODULE_DEVICE_TABLE(vio, viocd_device_table);

static struct vio_driver viocd_driver = {

	.name = "viocd",

	.id_table = viocd_device_table,

	.probe = viocd_probe,

	.remove = viocd_remove

	.remove = viocd_remove,

	.driver = {

		.name = "viocd",

	}

};



static int __init viocd_init(void)

drivers/char/hvc_vio.c

+1 −1
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev) 
}



static struct vio_driver hvc_vio_driver = {

	.name		= hvc_driver_name,

	.id_table	= hvc_driver_table,

	.probe		= hvc_vio_probe,

	.remove		= hvc_vio_remove,

	.driver		= {

		.name	= hvc_driver_name,

		.owner	= THIS_MODULE,

	}

};

drivers/char/hvcs.c

+3 −1
Original line number Diff line number Diff line
@@ -720,10 +720,12 @@ static int __devexit hvcs_remove(struct vio_dev *dev) 
};



static struct vio_driver hvcs_vio_driver = {

	.name		= hvcs_driver_name,

	.id_table	= hvcs_driver_table,

	.probe		= hvcs_probe,

	.remove		= hvcs_remove,

	.driver		= {

		.name	= hvcs_driver_name,

	}

};



/* Only called from hvcs_get_pi please */