Skip to content

Commit

Permalink
[PATCH] powerpc: tidy-up of_register_driver()/driver_register() retur…
Browse files Browse the repository at this point in the history
…n 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>
  • Loading branch information
Bjorn Helgaas authored and Paul Mackerras committed Mar 23, 2006
1 parent 57ae595 commit 6ea671a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
5 changes: 1 addition & 4 deletions arch/powerpc/kernel/of_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions drivers/macintosh/smu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}

Expand Down

0 comments on commit 6ea671a

Please sign in to comment.