gpio/tegra: assume CONFIG_OF
authorStephen Warren <swarren@nvidia.com>
Fri, 15 Feb 2013 21:54:48 +0000 (14:54 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 4 Mar 2013 02:22:18 +0000 (10:22 +0800)
Tegra only supports, and always enables, device tree. Remove all ifdefs
and runtime checks for DT support from the driver.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/gpio/gpio-tegra.c

index 414ad912232f9ecc1558c42e865d289920375dfc..a78a81fbc2b0879ee8e4ad432832262852008420 100644 (file)
@@ -398,10 +398,11 @@ static int tegra_gpio_probe(struct platform_device *pdev)
        int j;
 
        match = of_match_device(tegra_gpio_of_match, &pdev->dev);
-       if (match)
-               config = (struct tegra_gpio_soc_config *)match->data;
-       else
-               config = &tegra20_gpio_config;
+       if (!match) {
+               dev_err(&pdev->dev, "Error: No device match found\n");
+               return -ENODEV;
+       }
+       config = (struct tegra_gpio_soc_config *)match->data;
 
        tegra_gpio_bank_stride = config->bank_stride;
        tegra_gpio_upper_offset = config->upper_offset;
@@ -462,9 +463,7 @@ static int tegra_gpio_probe(struct platform_device *pdev)
                }
        }
 
-#ifdef CONFIG_OF_GPIO
        tegra_gpio_chip.of_node = pdev->dev.of_node;
-#endif
 
        gpiochip_add(&tegra_gpio_chip);