projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: remove use of __devexit
[linux-2.6-block.git]
/
drivers
/
input
/
touchscreen
/
ads7846.c
diff --git
a/drivers/input/touchscreen/ads7846.c
b/drivers/input/touchscreen/ads7846.c
index f02028ec3db6a6384dc194e7633ee12e8bbb7685..4f702b3ec1a3f1f9e4210d4e666c5be1beea8801 100644
(file)
--- a/
drivers/input/touchscreen/ads7846.c
+++ b/
drivers/input/touchscreen/ads7846.c
@@
-955,7
+955,8
@@
static int ads7846_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume);
static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume);
-static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads7846 *ts)
+static int ads7846_setup_pendown(struct spi_device *spi,
+ struct ads7846 *ts)
{
struct ads7846_platform_data *pdata = spi->dev.platform_data;
int err;
{
struct ads7846_platform_data *pdata = spi->dev.platform_data;
int err;
@@
-981,6
+982,9
@@
static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784
ts->gpio_pendown = pdata->gpio_pendown;
ts->gpio_pendown = pdata->gpio_pendown;
+ if (pdata->gpio_pendown_debounce)
+ gpio_set_debounce(pdata->gpio_pendown,
+ pdata->gpio_pendown_debounce);
} else {
dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n");
return -EINVAL;
} else {
dev_err(&spi->dev, "no get_pendown_state nor gpio_pendown?\n");
return -EINVAL;
@@
-993,7
+997,7
@@
static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784
* Set up the transfers to read touchscreen state; this assumes we
* use formula #2 for pressure, not #3.
*/
* Set up the transfers to read touchscreen state; this assumes we
* use formula #2 for pressure, not #3.
*/
-static void
__devinit
ads7846_setup_spi_msg(struct ads7846 *ts,
+static void ads7846_setup_spi_msg(struct ads7846 *ts,
const struct ads7846_platform_data *pdata)
{
struct spi_message *m = &ts->msg[0];
const struct ads7846_platform_data *pdata)
{
struct spi_message *m = &ts->msg[0];
@@
-1192,7
+1196,7
@@
static void __devinit ads7846_setup_spi_msg(struct ads7846 *ts,
spi_message_add_tail(x, m);
}
spi_message_add_tail(x, m);
}
-static int
__devinit
ads7846_probe(struct spi_device *spi)
+static int ads7846_probe(struct spi_device *spi)
{
struct ads7846 *ts;
struct ads7846_packet *packet;
{
struct ads7846 *ts;
struct ads7846_packet *packet;
@@
-1386,7
+1390,7
@@
static int __devinit ads7846_probe(struct spi_device *spi)
return err;
}
return err;
}
-static int
__devexit
ads7846_remove(struct spi_device *spi)
+static int ads7846_remove(struct spi_device *spi)
{
struct ads7846 *ts = dev_get_drvdata(&spi->dev);
{
struct ads7846 *ts = dev_get_drvdata(&spi->dev);
@@
-1430,7
+1434,7
@@
static struct spi_driver ads7846_driver = {
.pm = &ads7846_pm,
},
.probe = ads7846_probe,
.pm = &ads7846_pm,
},
.probe = ads7846_probe,
- .remove =
__devexit_p(ads7846_remove)
,
+ .remove =
ads7846_remove
,
};
module_spi_driver(ads7846_driver);
};
module_spi_driver(ads7846_driver);