aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@ti.com>2012-03-23 05:21:33 -0400
committerTony Lindgren <tony@atomide.com>2012-04-03 13:27:45 -0400
commit54da0784e24d955eab5f750a8c7c602aa8d4b4e3 (patch)
tree8cbd875aff04f89fa603388d6c134a2462257bd9 /arch
parentdd775ae2549217d3ae09363e3edb305d0fa19928 (diff)
ARM: OMAP2+: smsc911x: Remove odd gpmc_cfg/board_data redirection
This seems to be a leftover from when gpmc-smsc911x.c was copied from gpmc-smc91x.c. Signed-off-by: Russ Dill <russ.dill@ti.com> Tested-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/gpmc-smsc911x.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index 5e5880d6d099..aa0c296ff34a 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -26,8 +26,6 @@
26#include <plat/gpmc.h> 26#include <plat/gpmc.h>
27#include <plat/gpmc-smsc911x.h> 27#include <plat/gpmc-smsc911x.h>
28 28
29static struct omap_smsc911x_platform_data *gpmc_cfg;
30
31static struct resource gpmc_smsc911x_resources[] = { 29static struct resource gpmc_smsc911x_resources[] = {
32 [0] = { 30 [0] = {
33 .flags = IORESOURCE_MEM, 31 .flags = IORESOURCE_MEM,
@@ -93,14 +91,12 @@ static struct platform_device gpmc_smsc911x_regulator = {
93 * assume that pin multiplexing is done in the board-*.c file, 91 * assume that pin multiplexing is done in the board-*.c file,
94 * or in the bootloader. 92 * or in the bootloader.
95 */ 93 */
96void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data) 94void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *gpmc_cfg)
97{ 95{
98 struct platform_device *pdev; 96 struct platform_device *pdev;
99 unsigned long cs_mem_base; 97 unsigned long cs_mem_base;
100 int ret; 98 int ret;
101 99
102 gpmc_cfg = board_data;
103
104 if (!gpmc_cfg->id) { 100 if (!gpmc_cfg->id) {
105 ret = platform_device_register(&gpmc_smsc911x_regulator); 101 ret = platform_device_register(&gpmc_smsc911x_regulator);
106 if (ret < 0) { 102 if (ret < 0) {