---

yaml --- r: 236106 b: refs/heads/master c: ecc1058 h: refs/heads/master v: v3
git-mirror · Feb 23, 2011 · 064604c · 064604c
1 parent 0a77b6d
commit 064604c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae9f66da3d7e2f4ffa1bb6b07e62cddcb7614fa6
+refs/heads/master: ecc1058aecd986b9f00ba0b4b6ff3681dfb3ab47
diff --git a/trunk/drivers/staging/iio/magnetometer/ak8975.c b/trunk/drivers/staging/iio/magnetometer/ak8975.c
@@ -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 @@ static int ak8975_probe(struct i2c_client *client,
 			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 @@ static int ak8975_probe(struct i2c_client *client,
 
 	/* 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");

diff --git a/trunk/include/linux/input/ak8975.h b/trunk/include/linux/input/ak8975.h