aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/ads7846.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-24 00:38:25 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-24 03:05:19 -0500
commit5298cc4cc753bbe4c530b41341834f6ef3344d0d (patch)
tree5dde0337622144b635a7dc199844ed5376794b09 /drivers/input/touchscreen/ads7846.c
parent78f50c246f4286d40a1f42fecc779d47e40503a2 (diff)
Input: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen/ads7846.c')
-rw-r--r--drivers/input/touchscreen/ads7846.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 560484de0bfb..156a36b43bff 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -955,7 +955,7 @@ static int ads7846_resume(struct device *dev)
955 955
956static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); 956static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume);
957 957
958static int __devinit ads7846_setup_pendown(struct spi_device *spi, 958static int ads7846_setup_pendown(struct spi_device *spi,
959 struct ads7846 *ts) 959 struct ads7846 *ts)
960{ 960{
961 struct ads7846_platform_data *pdata = spi->dev.platform_data; 961 struct ads7846_platform_data *pdata = spi->dev.platform_data;
@@ -997,7 +997,7 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi,
997 * Set up the transfers to read touchscreen state; this assumes we 997 * Set up the transfers to read touchscreen state; this assumes we
998 * use formula #2 for pressure, not #3. 998 * use formula #2 for pressure, not #3.
999 */ 999 */
1000static void __devinit ads7846_setup_spi_msg(struct ads7846 *ts, 1000static void ads7846_setup_spi_msg(struct ads7846 *ts,
1001 const struct ads7846_platform_data *pdata) 1001 const struct ads7846_platform_data *pdata)
1002{ 1002{
1003 struct spi_message *m = &ts->msg[0]; 1003 struct spi_message *m = &ts->msg[0];
@@ -1196,7 +1196,7 @@ static void __devinit ads7846_setup_spi_msg(struct ads7846 *ts,
1196 spi_message_add_tail(x, m); 1196 spi_message_add_tail(x, m);
1197} 1197}
1198 1198
1199static int __devinit ads7846_probe(struct spi_device *spi) 1199static int ads7846_probe(struct spi_device *spi)
1200{ 1200{
1201 struct ads7846 *ts; 1201 struct ads7846 *ts;
1202 struct ads7846_packet *packet; 1202 struct ads7846_packet *packet;