aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-02-23 17:12:25 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-23 17:12:25 -0500
commitecc1058aecd986b9f00ba0b4b6ff3681dfb3ab47 (patch)
treec051ac05ff855bffc737bf6e24d63476e202ac09
parentae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6 (diff)
Revert "staging: iio: ak8975: add platform data."
This reverts commit f2f1794835f1d8900d2b15d114c54e70c849809b. It should not be putting code into the include/input/ directory, and lots of other people have complained about it. Cc: Tony SIM <chinyeow.sim.xt@renesas.com> Cc: Andrew Chew <achew@nvidia.com> Cc: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/iio/magnetometer/ak8975.c8
-rw-r--r--include/linux/input/ak8975.h20
2 files changed, 1 insertions, 27 deletions
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index 80c0f413707..420f206cf51 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -29,7 +29,6 @@
29#include <linux/delay.h> 29#include <linux/delay.h>
30 30
31#include <linux/gpio.h> 31#include <linux/gpio.h>
32#include <linux/input/ak8975.h>
33 32
34#include "../iio.h" 33#include "../iio.h"
35#include "magnet.h" 34#include "magnet.h"
@@ -436,7 +435,6 @@ static int ak8975_probe(struct i2c_client *client,
436 const struct i2c_device_id *id) 435 const struct i2c_device_id *id)
437{ 436{
438 struct ak8975_data *data; 437 struct ak8975_data *data;
439 struct ak8975_platform_data *pdata;
440 int err; 438 int err;
441 439
442 /* Allocate our device context. */ 440 /* Allocate our device context. */
@@ -454,11 +452,7 @@ static int ak8975_probe(struct i2c_client *client,
454 452
455 /* Grab and set up the supplied GPIO. */ 453 /* Grab and set up the supplied GPIO. */
456 data->eoc_irq = client->irq; 454 data->eoc_irq = client->irq;
457 pdata = client->dev.platform_data; 455 data->eoc_gpio = irq_to_gpio(client->irq);
458 if (pdata)
459 data->eoc_gpio = pdata->gpio;
460 else
461 data->eoc_gpio = irq_to_gpio(client->irq);
462 456
463 if (!data->eoc_gpio) { 457 if (!data->eoc_gpio) {
464 dev_err(&client->dev, "failed, no valid GPIO\n"); 458 dev_err(&client->dev, "failed, no valid GPIO\n");
diff --git a/include/linux/input/ak8975.h b/include/linux/input/ak8975.h
deleted file mode 100644
index 25d41eb10c3..00000000000
--- a/include/linux/input/ak8975.h
+++ /dev/null
@@ -1,20 +0,0 @@
1/*
2 * ak8975 platform support
3 *
4 * Copyright (C) 2010 Renesas Solutions Corp.
5 *
6 * Author: Tony SIM <chinyeow.sim.xt@renesas.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation.
11 */
12
13#ifndef _AK8975_H
14#define _AK8975_H
15
16struct ak8975_platform_data {
17 int gpio;
18};
19
20#endif