ARM: tegra: cardhu: Fix (or suppress) warnings
Scott Williams [Thu, 25 Aug 2011 21:04:14 +0000 (14:04 -0700)]
Change-Id: Ie1ec67106ffb4cf38415095a8db31d01fe1d5e10
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/49274
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R23e65a63d3f2869217af5cc7952ea64931ba4924

arch/arm/mach-tegra/board-cardhu-panel.c
arch/arm/mach-tegra/board-cardhu-sdhci.c
arch/arm/mach-tegra/board-cardhu.c

index 6fb80ad..295f448 100644 (file)
@@ -189,7 +189,6 @@ static void cardhu_backlight_exit(struct device *dev) {
 static int cardhu_backlight_notify(struct device *unused, int brightness)
 {
        int cur_sd_brightness = atomic_read(&sd_brightness);
-       int orig_brightness = brightness;
 
 #ifndef CONFIG_TEGRA_CARDHU_DSI
        /* Set the backlight GPIO pin mode to 'backlight_enable' */
index af1a502..cee4b61 100644 (file)
@@ -212,8 +212,8 @@ static int pm269_sd_wp_gpio_init(void)
 
 int __init cardhu_sdhci_init(void)
 {
-       unsigned int rc = 0;
 #if 0
+       unsigned int rc = 0;
        struct board_info board_info;
        tegra_get_board_info(&board_info);
        if (board_info.board_id == BOARD_PM269) {
@@ -234,20 +234,25 @@ int __init cardhu_sdhci_init(void)
 #endif
 
        platform_device_register(&tegra_sdhci_device3);
-//     platform_device_register(&tegra_sdhci_device2);
-
 #if 0
+       platform_device_register(&tegra_sdhci_device2);
+
        /* Fix ME: The gpios have to enabled for hot plug support */
        rc = cardhu_sd_cd_gpio_init();
        if (!rc) {
                tegra_sdhci_platform_data0.cd_gpio = CARDHU_SD_CD;
                tegra_sdhci_platform_data0.cd_gpio_polarity = 0;
        }
-#endif
-
 
+       platform_device_register(&tegra_sdhci_device0);
 
-//     platform_device_register(&tegra_sdhci_device0);
+#else
+       (void)tegra_sdhci_device0;
+       (void)tegra_sdhci_device2;
+       (void)cardhu_sd_cd_gpio_init;
+       (void)cardhu_sd_wp_gpio_init;
+       (void)pm269_sd_wp_gpio_init;
+#endif
 
        return 0;
 }
index b2e3f67..062002e 100644 (file)
@@ -759,7 +759,7 @@ static void cardhu_modem_init(void)
                if (board_info.fab >= BOARD_FAB_A04) {
                        ret = gpio_request(TEGRA_GPIO_PH7, "modem_perst");
                        if (ret < 0) {
-                               pr_err("%d(): Error in allocating gpio "
+                               pr_err("%s(): Error in allocating gpio "
                                        "TEGRA_GPIO_PH7\n", __func__);
                                break;
                        }