Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea671a1 authored Mar 21, 2006 by Bjorn Helgaas Committed by Paul Mackerras Mar 23, 2006

[PATCH] powerpc: tidy-up of_register_driver()/driver_register() return values



Remove the assumption that driver_register() returns the number of devices
bound to the driver.  In fact, it returns zero for success or a negative
error value.

Nobody uses the return value of of_register_driver() anyway.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent 57ae595f

arch/powerpc/kernel/of_device.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -147,15 +147,12 @@ postcore_initcall(of_bus_driver_init);

		int of_register_driver(struct of_platform_driver *drv)
		{
		int count = 0;

		/* initialize common driver fields */
		drv->driver.name = drv->name;
		drv->driver.bus = &of_platform_bus_type;

		/* register with core */
		count = driver_register(&drv->driver);
		return count ? count : 1;
		return driver_register(&drv->driver);
		}

		void of_unregister_driver(struct of_platform_driver *drv)

drivers/macintosh/smu.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -629,8 +629,6 @@ static struct of_platform_driver smu_of_platform_driver =

		static int __init smu_init_sysfs(void)
		{
		int rc;

		/*
		* Due to sysfs bogosity, a sysdev is not a real device, so
		* we should in fact create both if we want sysdev semantics
		@@ -639,7 +637,7 @@ static int __init smu_init_sysfs(void)
		* I'm a bit too far from figuring out how that works with those
		* new chipsets, but that will come back and bite us
		*/
		rc = of_register_driver(&smu_of_platform_driver);
		of_register_driver(&smu_of_platform_driver);
		return 0;
		}