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>

diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index 80c0f41..420f206 100644 (file)
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/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/include/linux/input/ak8975.h b/include/linux/input/ak8975.h
deleted file mode 100644 (file)
index 25d41eb..0000000
--- a/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