ARM: mx51: Remove imx51_add_gpio_keys

There is no need for using a MX51-specific version of imx_add_gpio_keys.

Remove imx51_add_gpio_keys and use imx_add_gpio_keys instead.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
LAKML-Reference: 1302105926-20574-1-git-send-email-fabio.estevam@freescale.com
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index cba59f16b2054edbb4267e7fcb79a8f40068975c..c7b3fabf50f99a550bb5242f0b3fad37c65ee650 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -355,7 +355,7 @@ static void __init mx51_babbage_init(void)
 
        /* Set the PAD settings for the pwr key. */
        mxc_iomux_v3_setup_pad(power_key);
-       imx51_add_gpio_keys(&imx_button_data);
+       imx_add_gpio_keys(&imx_button_data);
 
        imx51_add_imx_i2c(0, &babbage_i2c_data);
        imx51_add_imx_i2c(1, &babbage_i2c_data);

diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index c7c94596887e94e415c267b343504ab1021f3576..6e362315291b4f03a9dd71d6085b67edfd2078a6 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -249,7 +249,7 @@ static void __init mx51_efikamx_init(void)
        }
 
        platform_device_register(&mx51_efikamx_leds_device);
-       imx51_add_gpio_keys(&mx51_efikamx_powerkey_data);
+       imx_add_gpio_keys(&mx51_efikamx_powerkey_data);
 
        if (system_rev == 0x11) {
                gpio_request(EFIKAMX_RESET1_1, "reset");

diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
index 57b4d6bc6bf893af7fe383f25f677a908da4e097..474fc6e4c6df5593ecd0df7a80b3f3c8c5569a1c 100644 (file)
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
@@ -257,7 +257,7 @@ static void __init efikasb_board_init(void)
        imx51_add_sdhci_esdhc_imx(1, NULL);
 
        platform_device_register(&mx51_efikasb_leds_device);
-       imx51_add_gpio_keys(&mx51_efikasb_keys_data);
+       imx_add_gpio_keys(&mx51_efikasb_keys_data);
 
 }
 

diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
index e3253c506d506f3710169df4a0ea3207047debfa..e11bc0e0ec490fc1c1c12b32fde2b634ee39598e 100644 (file)
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
@@ -13,8 +13,6 @@ extern const struct imx_fec_data imx51_fec_data;
 #define imx51_add_fec(pdata)   \
        imx_add_fec(&imx51_fec_data, pdata)
 
-#define imx51_add_gpio_keys(pdata) imx_add_gpio_keys(pdata)
-
 extern const struct imx_imx_i2c_data imx51_imx_i2c_data[];
 #define imx51_add_imx_i2c(id, pdata)   \
        imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)