Commit fa7744db authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller
Browse files

[SPARC/64]: Prepare to remove of_platform_driver name. 



The name field of of_platform_driver is just copied into the
included device_driver.  By not overriding an already initialised
device_driver name, we can convert the drivers over time to stop using
the of_platform_driver name.

Also we were not copying the owner field from of_platform_driver, so do
the same with it.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8dd1612

Documentation/sparc/sbus_drivers.txt

+3 −1
Original line number Diff line number Diff line
@@ -67,10 +67,12 @@ probe in an SBUS driver under Linux: 
	MODULE_DEVICE_TABLE(of, mydevice_match);



	static struct of_platform_driver mydevice_driver = {

		.name		= "mydevice",

		.match_table	= mydevice_match,

		.probe		= mydevice_probe,

		.remove		= __devexit_p(mydevice_remove),

		.driver		= {

			.name		= "mydevice",

		},

	};



	static int __init mydevice_init(void)

arch/sparc/kernel/of_device.c

+4 −1
Original line number Diff line number Diff line
@@ -588,7 +588,10 @@ __setup("of_debug=", of_debug); 
int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)

{

	/* initialize common driver fields */

	if (!drv->driver.name)

		drv->driver.name = drv->name;

	if (!drv->driver.owner)

		drv->driver.owner = drv->owner;

	drv->driver.bus = bus;



	/* register with core */

arch/sparc64/kernel/of_device.c

+4 −1
Original line number Diff line number Diff line
@@ -872,7 +872,10 @@ __setup("of_debug=", of_debug); 
int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)

{

	/* initialize common driver fields */

	if (!drv->driver.name)

		drv->driver.name = drv->name;

	if (!drv->driver.owner)

		drv->driver.owner = drv->owner;

	drv->driver.bus = bus;



	/* register with core */

CRA Git | Maintained and supported by SUSTech CRA and CCSE