* [CFT 9/29] Add tiocx bus_type probe/remove methods [not found] <20060105142951.13.01@flint.arm.linux.org.uk> @ 2006-01-05 14:34 ` Russell King 2006-01-12 9:45 ` Paul Jackson 0 siblings, 1 reply; 3+ messages in thread From: Russell King @ 2006-01-05 14:34 UTC (permalink / raw) To: LKML; +Cc: Greg K-H, IA64 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/ia64/sn/kernel/tiocx.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/arch/ia64/sn/kernel/tiocx.c linux/arch/ia64/sn/kernel/tiocx.c --- linus/arch/ia64/sn/kernel/tiocx.c Sun Nov 6 22:14:30 2005 +++ linux/arch/ia64/sn/kernel/tiocx.c Sun Nov 13 16:07:12 2005 @@ -76,12 +76,6 @@ static void tiocx_bus_release(struct dev kfree(to_cx_dev(dev)); } -struct bus_type tiocx_bus_type = { - .name = "tiocx", - .match = tiocx_match, - .hotplug = tiocx_hotplug, -}; - /** * cx_device_match - Find cx_device in the id table. * @ids: id table from driver @@ -148,6 +142,14 @@ static int cx_driver_remove(struct devic return 0; } +struct bus_type tiocx_bus_type = { + .name = "tiocx", + .match = tiocx_match, + .hotplug = tiocx_hotplug, + .probe = cx_device_probe, + .remove = cx_device_remove, +}; + /** * cx_driver_register - Register the driver. * @cx_driver: driver table (cx_drv struct) from driver @@ -161,8 +163,6 @@ int cx_driver_register(struct cx_drv *cx { cx_driver->driver.name = cx_driver->name; cx_driver->driver.bus = &tiocx_bus_type; - cx_driver->driver.probe = cx_device_probe; - cx_driver->driver.remove = cx_driver_remove; return driver_register(&cx_driver->driver); } ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [CFT 9/29] Add tiocx bus_type probe/remove methods 2006-01-05 14:34 ` [CFT 9/29] Add tiocx bus_type probe/remove methods Russell King @ 2006-01-12 9:45 ` Paul Jackson 2006-01-12 10:31 ` Paul Jackson 0 siblings, 1 reply; 3+ messages in thread From: Paul Jackson @ 2006-01-12 9:45 UTC (permalink / raw) To: Russell King; +Cc: linux-kernel, greg, linux-ia64 This patch looks broken. I see the lines: + .remove = cx_device_remove, - cx_driver->driver.remove = cx_driver_remove; The routine (not in this patch) is still known as "cx_driver_remove" but now it is linked to from the .remove line as "cx_device_remove" A defconfig ia64 build of *-mm3 with this patch fails: arch/ia64/sn/kernel/tiocx.c:151: error: `cx_device_remove' undeclared here (not in a function) arch/ia64/sn/kernel/tiocx.c:151: error: initializer element is not constant arch/ia64/sn/kernel/tiocx.c:151: error: (near initialization for `tiocx_bus_type.remove') arch/ia64/sn/kernel/tiocx.c:137: warning: `cx_driver_remove' defined but not used When I s/cx_device_remove/cx_driver_remove/, then ia64 *-mm3 defconfig builds fine. -- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson <pj@sgi.com> 1.925.600.0401 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [CFT 9/29] Add tiocx bus_type probe/remove methods 2006-01-12 9:45 ` Paul Jackson @ 2006-01-12 10:31 ` Paul Jackson 0 siblings, 0 replies; 3+ messages in thread From: Paul Jackson @ 2006-01-12 10:31 UTC (permalink / raw) To: Adrian Bunk; +Cc: rmk, linux-kernel, greg, linux-ia64 pj wrote: > This patch looks broken. I see the lines: > > + .remove = cx_device_remove, > - cx_driver->driver.remove = cx_driver_remove; It looks like Adrian already posted a patch for this - thanks. -- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson <pj@sgi.com> 1.925.600.0401 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-01-12 10:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20060105142951.13.01@flint.arm.linux.org.uk>
2006-01-05 14:34 ` [CFT 9/29] Add tiocx bus_type probe/remove methods Russell King
2006-01-12 9:45 ` Paul Jackson
2006-01-12 10:31 ` Paul Jackson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox