aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/htcpen.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/touchscreen/htcpen.c')
-rw-r--r--drivers/input/touchscreen/htcpen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
index d13143b68b3..6c4fb843695 100644
--- a/drivers/input/touchscreen/htcpen.c
+++ b/drivers/input/touchscreen/htcpen.c
@@ -102,7 +102,7 @@ static void htcpen_close(struct input_dev *dev)
102 synchronize_irq(HTCPEN_IRQ); 102 synchronize_irq(HTCPEN_IRQ);
103} 103}
104 104
105static int __devinit htcpen_isa_probe(struct device *dev, unsigned int id) 105static int htcpen_isa_probe(struct device *dev, unsigned int id)
106{ 106{
107 struct input_dev *htcpen_dev; 107 struct input_dev *htcpen_dev;
108 int err = -EBUSY; 108 int err = -EBUSY;
@@ -174,7 +174,7 @@ static int __devinit htcpen_isa_probe(struct device *dev, unsigned int id)
174 return err; 174 return err;
175} 175}
176 176
177static int __devexit htcpen_isa_remove(struct device *dev, unsigned int id) 177static int htcpen_isa_remove(struct device *dev, unsigned int id)
178{ 178{
179 struct input_dev *htcpen_dev = dev_get_drvdata(dev); 179 struct input_dev *htcpen_dev = dev_get_drvdata(dev);
180 180
@@ -210,7 +210,7 @@ static int htcpen_isa_resume(struct device *dev, unsigned int n)
210 210
211static struct isa_driver htcpen_isa_driver = { 211static struct isa_driver htcpen_isa_driver = {
212 .probe = htcpen_isa_probe, 212 .probe = htcpen_isa_probe,
213 .remove = __devexit_p(htcpen_isa_remove), 213 .remove = htcpen_isa_remove,
214#ifdef CONFIG_PM 214#ifdef CONFIG_PM
215 .suspend = htcpen_isa_suspend, 215 .suspend = htcpen_isa_suspend,
216 .resume = htcpen_isa_resume, 216 .resume = htcpen_isa_resume,