From: Olof Johansson <olofj@chromium.org>
Date: Wed, 30 May 2012 11:18:18 +0000 (-0700)
Subject: mfd: tps65090: remove platform data
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=4de69d5abdb7db2f0b4f28eb9739bd7551724189;p=cascardo%2Flinux.git

mfd: tps65090: remove platform data

Platform data isn't really needed for this MFD driver; the regulator
data is not passed in through it and the MFD subdev information isn't
really a function of board configuration. So it makes perfect sense to
just hardcode the cells in the driver and not having to specify them on
every board, etc.

BUG=chrome-os-partner:9776
TEST=build, boot, see graphics on console

Change-Id: I94ddd28b037027fdfab5d41a741d8ffedac97ae8
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit-int.chromium.org/18606
Reviewed-by: Doug Anderson <dianders@google.com>
Tested-by: Olof Johansson <olofj@google.com>
---

diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index e5c526d91dda..07629a13cbff 100644
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -275,15 +275,9 @@ static const struct regmap_config tps65090_regmap_config = {
 static int __devinit tps65090_i2c_probe(struct i2c_client *client,
 					const struct i2c_device_id *id)
 {
-	struct tps65090_platform_data *pdata = client->dev.platform_data;
 	struct tps65090 *tps65090;
 	int ret;
 
-	if (!pdata) {
-		dev_err(&client->dev, "tps65090 requires platform data\n");
-		return -EINVAL;
-	}
-
 	tps65090 = devm_kzalloc(&client->dev, sizeof(struct tps65090),
 		GFP_KERNEL);
 	if (tps65090 == NULL)
diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h
index 38e31c55adbb..9dc2940f717b 100644
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@ -22,18 +22,6 @@
 #ifndef __LINUX_MFD_TPS65090_H
 #define __LINUX_MFD_TPS65090_H
 
-struct tps65090_subdev_info {
-	int		id;
-	const char	*name;
-	void		*platform_data;
-};
-
-struct tps65090_platform_data {
-	int irq_base;
-	int num_subdevs;
-	struct tps65090_subdev_info *subdevs;
-};
-
 /*
  * NOTE: the functions below are not intended for use outside
  * of the TPS65090 sub-device drivers