projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging: release out (3.8.3)
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
drivers
/
input
/
touchscreen
/
stmpe-ts.c
diff --git
a/drivers/input/touchscreen/stmpe-ts.c
b/drivers/input/touchscreen/stmpe-ts.c
index
43e7967
..
84d884b
100644
(file)
--- a/
drivers/input/touchscreen/stmpe-ts.c
+++ b/
drivers/input/touchscreen/stmpe-ts.c
@@
-168,7
+168,7
@@
static irqreturn_t stmpe_ts_handler(int irq, void *data)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static int
__devinit
stmpe_init_hw(struct stmpe_touch *ts)
+static int stmpe_init_hw(struct stmpe_touch *ts)
{
int ret;
u8 adc_ctrl1, adc_ctrl1_mask, tsc_cfg, tsc_cfg_mask;
{
int ret;
u8 adc_ctrl1, adc_ctrl1_mask, tsc_cfg, tsc_cfg_mask;
@@
-308,7
+308,7
@@
static void stmpe_ts_get_platform_info(struct platform_device *pdev,
}
}
}
}
-static int
__devinit
stmpe_input_probe(struct platform_device *pdev)
+static int stmpe_input_probe(struct platform_device *pdev)
{
struct stmpe_touch *ts;
struct input_dev *idev;
{
struct stmpe_touch *ts;
struct input_dev *idev;
@@
-371,7
+371,7
@@
static int __devinit stmpe_input_probe(struct platform_device *pdev)
return 0;
}
return 0;
}
-static int
__devexit
stmpe_ts_remove(struct platform_device *pdev)
+static int stmpe_ts_remove(struct platform_device *pdev)
{
struct stmpe_touch *ts = platform_get_drvdata(pdev);
{
struct stmpe_touch *ts = platform_get_drvdata(pdev);
@@
-386,7
+386,7
@@
static struct platform_driver stmpe_ts_driver = {
.owner = THIS_MODULE,
},
.probe = stmpe_input_probe,
.owner = THIS_MODULE,
},
.probe = stmpe_input_probe,
- .remove =
__devexit_p(stmpe_ts_remove)
,
+ .remove =
stmpe_ts_remove
,
};
module_platform_driver(stmpe_ts_driver);
};
module_platform_driver(stmpe_ts_driver);