Title: [9680] trunk/drivers/staging/iio/magnetometer/ak8975.c: merge from upstream: Revert "staging: iio: ak8975: add platform data."
- Revision
- 9680
- Author
- vapier
- Date
- 2011-03-01 16:18:13 -0500 (Tue, 01 Mar 2011)
Log Message
merge from upstream: Revert "staging: iio: ak8975: add platform data."
From: Greg Kroah-Hartman <[email protected]>
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 <[email protected]>
Cc: Andrew Chew <[email protected]>
Cc: Jonathan Cameron <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/magnetometer/ak8975.c (9679 => 9680)
--- trunk/drivers/staging/iio/magnetometer/ak8975.c 2011-03-01 21:18:09 UTC (rev 9679)
+++ trunk/drivers/staging/iio/magnetometer/ak8975.c 2011-03-01 21:18:13 UTC (rev 9680)
@@ -29,7 +29,6 @@
#include <linux/delay.h>
#include <linux/gpio.h>
-#include <linux/input/ak8975.h>
#include "../iio.h"
#include "magnet.h"
@@ -436,7 +435,6 @@
const struct i2c_device_id *id)
{
struct ak8975_data *data;
- struct ak8975_platform_data *pdata;
int err;
/* Allocate our device context. */
@@ -454,11 +452,7 @@
/* Grab and set up the supplied GPIO. */
data->eoc_irq = client->irq;
- pdata = client->dev.platform_data;
- if (pdata)
- data->eoc_gpio = pdata->gpio;
- else
- data->eoc_gpio = irq_to_gpio(client->irq);
+ data->eoc_gpio = irq_to_gpio(client->irq);
if (!data->eoc_gpio) {
dev_err(&client->dev, "failed, no valid GPIO\n");
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
