diff options
| author |  Linus Torvalds <torvalds@g5.osdl.org>
| 2005-11-11 09:24:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org>
| 2005-11-11 09:24:26 -0800 |
| commit | 5643f000c1e10ab991182478b76550e1364c3570 (patch) | |
| tree | 950b2f61a5dd742de1c668ba968a9c8a99f1eab6 /drivers/char/tb0219.c | |
| parent | [PATCH] ipmi: fix inconsistent spinlock usage (diff) | |
| parent | [DRIVER MODEL] Convert platform drivers to use struct platform_driver (diff) | |
| download | linux-5643f000c1e10ab991182478b76550e1364c3570.tar.gz linux-5643f000c1e10ab991182478b76550e1364c3570.tar.bz2 linux-5643f000c1e10ab991182478b76550e1364c3570.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Diffstat (limited to 'drivers/char/tb0219.c')
| -rw-r--r-- | drivers/char/tb0219.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c index 24355b23b2ca..b3d411a756fe 100644 --- a/drivers/char/tb0219.c +++ b/drivers/char/tb0219.c @@ -283,7 +283,7 @@ static void tb0219_pci_irq_init(void) vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW); } -static int tb0219_probe(struct device *dev) +static int tb0219_probe(struct platform_device *dev) { int retval; @@ -319,7 +319,7 @@ static int tb0219_probe(struct device *dev) return 0; } -static int tb0219_remove(struct device *dev) +static int tb0219_remove(struct platform_device *dev) { _machine_restart = old_machine_restart; @@ -333,11 +333,12 @@ static int tb0219_remove(struct device *dev) static struct platform_device *tb0219_platform_device; -static struct device_driver tb0219_device_driver = { - .name = "TB0219", - .bus = &platform_bus_type, +static struct platform_driver tb0219_device_driver = { .probe = tb0219_probe, .remove = tb0219_remove, + .driver = { + .name = "TB0219", + }, }; static int __devinit tanbac_tb0219_init(void) @@ -348,7 +349,7 @@ static int __devinit tanbac_tb0219_init(void) if (IS_ERR(tb0219_platform_device)) return PTR_ERR(tb0219_platform_device); - retval = driver_register(&tb0219_device_driver); + retval = platform_driver_register(&tb0219_device_driver); if (retval < 0) platform_device_unregister(tb0219_platform_device); @@ -357,7 +358,7 @@ static int __devinit tanbac_tb0219_init(void) static void __devexit tanbac_tb0219_exit(void) { - driver_unregister(&tb0219_device_driver); + platform_driver_unregister(&tb0219_device_driver); platform_device_unregister(tb0219_platform_device); } |