twl4030-pwrbutton.c (d9c5841e22231e4e49fd0a1004164e6fce59b7a6) | twl4030-pwrbutton.c (dda7b73cdf9dc5bd52c3adad42cb5e6ab4639883) |
---|---|
1/** 2 * twl4030-pwrbutton.c - TWL4030 Power Button Input Driver 3 * 4 * Copyright (C) 2008-2009 Nokia Corporation 5 * 6 * Written by Peter De Schrijver <peter.de-schrijver@nokia.com> 7 * Several fixes by Felipe Balbi <felipe.balbi@nokia.com> 8 * --- 38 unchanged lines hidden (view full) --- 47 } else { 48 dev_err(pwr->dev.parent, "twl4030: i2c error %d while reading" 49 " TWL4030 PM_MASTER STS_HW_CONDITIONS register\n", err); 50 } 51 52 return IRQ_HANDLED; 53} 54 | 1/** 2 * twl4030-pwrbutton.c - TWL4030 Power Button Input Driver 3 * 4 * Copyright (C) 2008-2009 Nokia Corporation 5 * 6 * Written by Peter De Schrijver <peter.de-schrijver@nokia.com> 7 * Several fixes by Felipe Balbi <felipe.balbi@nokia.com> 8 * --- 38 unchanged lines hidden (view full) --- 47 } else { 48 dev_err(pwr->dev.parent, "twl4030: i2c error %d while reading" 49 " TWL4030 PM_MASTER STS_HW_CONDITIONS register\n", err); 50 } 51 52 return IRQ_HANDLED; 53} 54 |
55static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev) | 55static int __init twl4030_pwrbutton_probe(struct platform_device *pdev) |
56{ 57 struct input_dev *pwr; 58 int irq = platform_get_irq(pdev, 0); 59 int err; 60 61 pwr = input_allocate_device(); 62 if (!pwr) { 63 dev_dbg(&pdev->dev, "Can't allocate power button\n"); --- 26 unchanged lines hidden (view full) --- 90 91free_irq: 92 free_irq(irq, NULL); 93free_input_dev: 94 input_free_device(pwr); 95 return err; 96} 97 | 56{ 57 struct input_dev *pwr; 58 int irq = platform_get_irq(pdev, 0); 59 int err; 60 61 pwr = input_allocate_device(); 62 if (!pwr) { 63 dev_dbg(&pdev->dev, "Can't allocate power button\n"); --- 26 unchanged lines hidden (view full) --- 90 91free_irq: 92 free_irq(irq, NULL); 93free_input_dev: 94 input_free_device(pwr); 95 return err; 96} 97 |
98static int __devexit twl4030_pwrbutton_remove(struct platform_device *pdev) | 98static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev) |
99{ 100 struct input_dev *pwr = platform_get_drvdata(pdev); 101 int irq = platform_get_irq(pdev, 0); 102 103 free_irq(irq, pwr); 104 input_unregister_device(pwr); 105 106 return 0; 107} 108 | 99{ 100 struct input_dev *pwr = platform_get_drvdata(pdev); 101 int irq = platform_get_irq(pdev, 0); 102 103 free_irq(irq, pwr); 104 input_unregister_device(pwr); 105 106 return 0; 107} 108 |
109struct platform_driver twl4030_pwrbutton_driver = { 110 .probe = twl4030_pwrbutton_probe, 111 .remove = __devexit_p(twl4030_pwrbutton_remove), | 109static struct platform_driver twl4030_pwrbutton_driver = { 110 .remove = __exit_p(twl4030_pwrbutton_remove), |
112 .driver = { 113 .name = "twl4030_pwrbutton", 114 .owner = THIS_MODULE, 115 }, 116}; 117 118static int __init twl4030_pwrbutton_init(void) 119{ | 111 .driver = { 112 .name = "twl4030_pwrbutton", 113 .owner = THIS_MODULE, 114 }, 115}; 116 117static int __init twl4030_pwrbutton_init(void) 118{ |
120 return platform_driver_register(&twl4030_pwrbutton_driver); | 119 return platform_driver_probe(&twl4030_pwrbutton_driver, 120 twl4030_pwrbutton_probe); |
121} 122module_init(twl4030_pwrbutton_init); 123 124static void __exit twl4030_pwrbutton_exit(void) 125{ 126 platform_driver_unregister(&twl4030_pwrbutton_driver); 127} 128module_exit(twl4030_pwrbutton_exit); 129 130MODULE_ALIAS("platform:twl4030_pwrbutton"); 131MODULE_DESCRIPTION("Triton2 Power Button"); 132MODULE_LICENSE("GPL"); 133MODULE_AUTHOR("Peter De Schrijver <peter.de-schrijver@nokia.com>"); 134MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); 135 | 121} 122module_init(twl4030_pwrbutton_init); 123 124static void __exit twl4030_pwrbutton_exit(void) 125{ 126 platform_driver_unregister(&twl4030_pwrbutton_driver); 127} 128module_exit(twl4030_pwrbutton_exit); 129 130MODULE_ALIAS("platform:twl4030_pwrbutton"); 131MODULE_DESCRIPTION("Triton2 Power Button"); 132MODULE_LICENSE("GPL"); 133MODULE_AUTHOR("Peter De Schrijver <peter.de-schrijver@nokia.com>"); 134MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>"); 135 |