From 064604c587e93edc318ff10fdeecd69d5c0ad231 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 23 Feb 2011 14:12:25 -0800
Subject: [PATCH] --- yaml --- r: 236106 b: refs/heads/master c:
 ecc1058aecd986b9f00ba0b4b6ff3681dfb3ab47 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/staging/iio/magnetometer/ak8975.c |  8 +-------
 trunk/include/linux/input/ak8975.h            | 20 -------------------
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 trunk/include/linux/input/ak8975.h

diff --git a/[refs] b/[refs]
index 2cbaae3bfd89..b67e4e3df535 100644
--- 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
index 80c0f4137076..420f206cf517 100644
--- 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
deleted file mode 100644
index 25d41eb10c3e..000000000000
--- a/trunk/include/linux/input/ak8975.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * ak8975 platform support
- *
- * Copyright (C) 2010 Renesas Solutions Corp.
- *
- * Author: Tony SIM <chinyeow.sim.xt@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _AK8975_H
-#define _AK8975_H
-
-struct ak8975_platform_data {
-	int gpio;
-};
-
-#endif