cbus/retu-wdt.c: Use platform_driver
PATCH 5/6 cbus/retu-wdt.c: Use platform_driver
Use platform_driver
Signed-off-by Komal Shah <[email protected]>
---Komal Shah
http://komalshah.blogspot.com/
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
drivers/cbus/retu-wdt.c +19 -16
@@ -103,29 +103,29 @@ static DEVICE_ATTR(period, S_IRUGO | S_I retu_wdt_period_store); static DEVICE_ATTR(counter, S_IRUGO, retu_wdt_counter_show, NULL); -static int __devinit retu_wdt_probe (struct device *dev) +static int __devinit retu_wdt_probe (struct platform_device *pdev) {int ret; - ret =device_create_file (dev, &dev_attr_period); + ret =device_create_file (&pdev->dev, &dev_attr_period);if (ret) {printk (KERN_ERR "retu_wdt_probe: Error creating sys device file: period\n" );return ret; } - ret =device_create_file (dev, &dev_attr_counter); + ret =device_create_file (&pdev->dev, &dev_attr_counter);if (ret) { -device_remove_file (dev, &dev_attr_period); +device_remove_file (&pdev->dev, &dev_attr_period);printk (KERN_ERR "retu_wdt_probe: Error creating sys device file: counter\n" ); }return ret; } -static int __devexit retu_wdt_remove(struct device *dev) +static int __devexit retu_wdt_remove(struct platform_device *pdev) { -device_remove_file (dev, &dev_attr_period); -device_remove_file (dev, &dev_attr_counter); +device_remove_file (&pdev->dev, &dev_attr_period); +device_remove_file (&pdev->dev, &dev_attr_counter);return 0 ; }
@@ -142,20 +142,23 @@ static struct platform_device retu_wdt_d }, }; -static struct device_driver retu_wdt_driver = { - .name ="retu-watchdog" , - .bus = &platform_bus_type, - .probe = retu_wdt_probe, - .remove =__devexit_p (retu_wdt_remove), +static struct platform_driver retu_wdt_driver = { + .probe = retu_wdt_probe, + .remove =__devexit_p (retu_wdt_remove), + .driver = { + .name ="retu-watchdog" , + }, }; +static char banner[]__initdata =KERN_INFO "Retu watchdog driver initialized\n" ; +static int __init retu_wdt_init (void ) {int ret;init_completion (&retu_wdt_completion); - ret =driver_register (&retu_wdt_driver); + ret =platform_driver_register (&retu_wdt_driver);if (ret)return ret;
@@ -170,12 +173,12 @@ static int __init retu_wdt_init(void)printk (KERN_INFO "retu_wdt_init: Intializing to default value\n" ); } - -printk (KERN_INFO "Retu watchdog driver initialized\n" ); + +printk (banner);return ret; exit1: -driver_unregister (&retu_wdt_driver); +platform_driver_unregister (&retu_wdt_driver);wait_for_completion (&retu_wdt_completion);return ret;