Revert "staging: iio: ak8975: add platform data."
This reverts commit f2f1794835
.
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>
This commit is contained in:
parent
ae9f66da3d
commit
ecc1058aec
|
@ -29,7 +29,6 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
|
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/input/ak8975.h>
|
|
||||||
|
|
||||||
#include "../iio.h"
|
#include "../iio.h"
|
||||||
#include "magnet.h"
|
#include "magnet.h"
|
||||||
|
@ -436,7 +435,6 @@ static int ak8975_probe(struct i2c_client *client,
|
||||||
const struct i2c_device_id *id)
|
const struct i2c_device_id *id)
|
||||||
{
|
{
|
||||||
struct ak8975_data *data;
|
struct ak8975_data *data;
|
||||||
struct ak8975_platform_data *pdata;
|
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
/* Allocate our device context. */
|
/* Allocate our device context. */
|
||||||
|
@ -454,11 +452,7 @@ static int ak8975_probe(struct i2c_client *client,
|
||||||
|
|
||||||
/* Grab and set up the supplied GPIO. */
|
/* Grab and set up the supplied GPIO. */
|
||||||
data->eoc_irq = client->irq;
|
data->eoc_irq = client->irq;
|
||||||
pdata = client->dev.platform_data;
|
data->eoc_gpio = irq_to_gpio(client->irq);
|
||||||
if (pdata)
|
|
||||||
data->eoc_gpio = pdata->gpio;
|
|
||||||
else
|
|
||||||
data->eoc_gpio = irq_to_gpio(client->irq);
|
|
||||||
|
|
||||||
if (!data->eoc_gpio) {
|
if (!data->eoc_gpio) {
|
||||||
dev_err(&client->dev, "failed, no valid GPIO\n");
|
dev_err(&client->dev, "failed, no valid GPIO\n");
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in a new issue