From 71a8394369aaedb0b509fceb918ca59877da1ab6 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 21 Mar 2006 23:20:27 -0800 Subject: [PATCH] --- yaml --- r: 22972 b: refs/heads/master c: 6ea671a12f66b9d4d0f35fce957a71a6849295f2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/of_device.c | 5 +---- trunk/drivers/macintosh/smu.c | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b5843e2f3537..4bb2ce73c4a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57ae595f6bf8bde42de199ff9fe68b873080fde2 +refs/heads/master: 6ea671a12f66b9d4d0f35fce957a71a6849295f2 diff --git a/trunk/arch/powerpc/kernel/of_device.c b/trunk/arch/powerpc/kernel/of_device.c index 22d83d4d1af5..9feeeef5a875 100644 --- a/trunk/arch/powerpc/kernel/of_device.c +++ b/trunk/arch/powerpc/kernel/of_device.c @@ -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) diff --git a/trunk/drivers/macintosh/smu.c b/trunk/drivers/macintosh/smu.c index db2ae71d07ef..4eb05d7143d8 100644 --- a/trunk/drivers/macintosh/smu.c +++ b/trunk/drivers/macintosh/smu.c @@ -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; }