From: Aaro Koskinen <aaro.koskinen@iki.fi> To: Tony Lindgren <tony@atomide.com>, Samuel Ortiz <sameo@linux.intel.com>, Lee Jones <lee.jones@linaro.org>, devicetree@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Subject: [PATCH 5/7] mfd: menelaus: delete platform data support Date: Sat, 27 Dec 2014 19:52:57 +0200 [thread overview] Message-ID: <1419702779-16001-6-git-send-email-aaro.koskinen@iki.fi> (raw) In-Reply-To: <1419702779-16001-1-git-send-email-aaro.koskinen@iki.fi> Delete platform data support. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> --- arch/arm/mach-omap2/common-board-devices.h | 2 -- drivers/mfd/menelaus.c | 10 +--------- include/linux/mfd/menelaus.h | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 07c88ae..7a30228 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -2,7 +2,6 @@ #define __OMAP_COMMON_BOARD_DEVICES__ #include <sound/tlv320aic3x.h> -#include <linux/mfd/menelaus.h> #include "twl-common.h" #define NAND_BLOCK_SIZE SZ_128K @@ -14,7 +13,6 @@ void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, struct ads7846_platform_data *board_pdata); void *n8x0_legacy_init(void); -extern struct menelaus_platform_data n8x0_menelaus_platform_data; extern struct aic3x_pdata n810_aic33_data; #endif /* __OMAP_COMMON_BOARD_DEVICES__ */ diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 3e04c64..4a900cc 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1181,8 +1181,6 @@ static int menelaus_probe(struct i2c_client *client, int rev = 0; int err = 0; struct device_node *np = client->dev.of_node; - struct menelaus_platform_data *menelaus_pdata = - dev_get_platdata(&client->dev); if (the_menelaus) { dev_dbg(&client->dev, "only one %s for now\n", @@ -1240,13 +1238,7 @@ static int menelaus_probe(struct i2c_client *client, else menelaus->vcore_hw_mode = 0; - if (menelaus_pdata != NULL) { - if (menelaus_pdata->late_init != NULL) { - err = menelaus_pdata->late_init(&client->dev); - if (err < 0) - goto fail; - } - } else if (np) { + if (np) { u32 vcore_min; u32 vcore_max; diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h index 9e85ac0..21eeff5 100644 --- a/include/linux/mfd/menelaus.h +++ b/include/linux/mfd/menelaus.h @@ -5,12 +5,6 @@ #ifndef __ASM_ARCH_MENELAUS_H #define __ASM_ARCH_MENELAUS_H -struct device; - -struct menelaus_platform_data { - int (* late_init)(struct device *dev); -}; - extern int menelaus_register_mmc_callback(void (*callback)(void *data, u8 card_mask), void *data); extern void menelaus_unregister_mmc_callback(void); -- 2.2.0
WARNING: multiple messages have this Message-ID (diff)
From: aaro.koskinen@iki.fi (Aaro Koskinen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] mfd: menelaus: delete platform data support Date: Sat, 27 Dec 2014 19:52:57 +0200 [thread overview] Message-ID: <1419702779-16001-6-git-send-email-aaro.koskinen@iki.fi> (raw) In-Reply-To: <1419702779-16001-1-git-send-email-aaro.koskinen@iki.fi> Delete platform data support. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> --- arch/arm/mach-omap2/common-board-devices.h | 2 -- drivers/mfd/menelaus.c | 10 +--------- include/linux/mfd/menelaus.h | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 07c88ae..7a30228 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -2,7 +2,6 @@ #define __OMAP_COMMON_BOARD_DEVICES__ #include <sound/tlv320aic3x.h> -#include <linux/mfd/menelaus.h> #include "twl-common.h" #define NAND_BLOCK_SIZE SZ_128K @@ -14,7 +13,6 @@ void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, struct ads7846_platform_data *board_pdata); void *n8x0_legacy_init(void); -extern struct menelaus_platform_data n8x0_menelaus_platform_data; extern struct aic3x_pdata n810_aic33_data; #endif /* __OMAP_COMMON_BOARD_DEVICES__ */ diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 3e04c64..4a900cc 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1181,8 +1181,6 @@ static int menelaus_probe(struct i2c_client *client, int rev = 0; int err = 0; struct device_node *np = client->dev.of_node; - struct menelaus_platform_data *menelaus_pdata = - dev_get_platdata(&client->dev); if (the_menelaus) { dev_dbg(&client->dev, "only one %s for now\n", @@ -1240,13 +1238,7 @@ static int menelaus_probe(struct i2c_client *client, else menelaus->vcore_hw_mode = 0; - if (menelaus_pdata != NULL) { - if (menelaus_pdata->late_init != NULL) { - err = menelaus_pdata->late_init(&client->dev); - if (err < 0) - goto fail; - } - } else if (np) { + if (np) { u32 vcore_min; u32 vcore_max; diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h index 9e85ac0..21eeff5 100644 --- a/include/linux/mfd/menelaus.h +++ b/include/linux/mfd/menelaus.h @@ -5,12 +5,6 @@ #ifndef __ASM_ARCH_MENELAUS_H #define __ASM_ARCH_MENELAUS_H -struct device; - -struct menelaus_platform_data { - int (* late_init)(struct device *dev); -}; - extern int menelaus_register_mmc_callback(void (*callback)(void *data, u8 card_mask), void *data); extern void menelaus_unregister_mmc_callback(void); -- 2.2.0
next prev parent reply other threads:[~2014-12-27 17:52 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-27 17:52 [PATCH 0/7] Menelaus cleanup for DT, phase 1 Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen 2014-12-27 17:52 ` [PATCH 1/7] mfd: menelaus: delete omap_has_menelaus Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen 2015-01-20 13:50 ` Lee Jones 2015-01-20 13:50 ` Lee Jones 2014-12-27 17:52 ` [PATCH 2/7] mfd: menelaus: drop support for SW controller VCORE Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen 2015-01-20 13:52 ` Lee Jones 2015-01-20 13:52 ` Lee Jones 2014-12-27 17:52 ` [PATCH 3/7] mfd: menelaus: add initial DT support Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen 2014-12-27 21:25 ` Felipe Balbi 2014-12-27 21:25 ` Felipe Balbi 2014-12-28 23:34 ` Aaro Koskinen 2014-12-28 23:34 ` Aaro Koskinen 2014-12-29 18:12 ` Felipe Balbi 2014-12-29 18:12 ` Felipe Balbi 2014-12-27 17:52 ` Aaro Koskinen [this message] 2014-12-27 17:52 ` [PATCH 5/7] mfd: menelaus: delete platform data support Aaro Koskinen 2015-01-20 13:54 ` Lee Jones 2015-01-20 13:54 ` Lee Jones 2014-12-27 17:52 ` [PATCH 6/7] mfd: menelaus: make vcore and regulator controls internal Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen 2015-01-20 13:58 ` Lee Jones 2015-01-20 13:58 ` Lee Jones 2015-01-20 14:01 ` Lee Jones 2015-01-20 14:01 ` Lee Jones 2014-12-27 17:52 ` [PATCH 7/7] mfd: menelaus: use macro for magic number Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen [not found] ` <1419702779-16001-8-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org> 2015-01-20 14:01 ` Lee Jones 2015-01-20 14:01 ` Lee Jones [not found] ` <1419702779-16001-1-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org> 2014-12-27 17:52 ` [PATCH 4/7] ARM: OMAP: N8x0: configure menelaus using DT Aaro Koskinen 2014-12-27 17:52 ` Aaro Koskinen 2015-01-20 17:13 ` [PATCH 0/7] Menelaus cleanup for DT, phase 1 Lee Jones 2015-01-20 17:13 ` Lee Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1419702779-16001-6-git-send-email-aaro.koskinen@iki.fi \ --to=aaro.koskinen@iki.fi \ --cc=devicetree@vger.kernel.org \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=sameo@linux.intel.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.