diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-02-15 14:54:48 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-03-04 10:22:18 +0800 |
| commit | 165b6c2f33860e13d20cd7ac5993ea3acfb5ea34 (patch) | |
| tree | fb6182cb5bc63d3ec162081531459f00a298e3c1 /drivers/gpio/gpio-tegra.c | |
| parent | e97f9b5277afeabb54892ebc6f68500098467ba1 (diff) | |
| download | linux-3.10-165b6c2f33860e13d20cd7ac5993ea3acfb5ea34.tar.gz linux-3.10-165b6c2f33860e13d20cd7ac5993ea3acfb5ea34.tar.bz2 linux-3.10-165b6c2f33860e13d20cd7ac5993ea3acfb5ea34.zip | |
gpio/tegra: assume CONFIG_OF
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>
Diffstat (limited to 'drivers/gpio/gpio-tegra.c')
| -rw-r--r-- | drivers/gpio/gpio-tegra.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index 414ad912232..a78a81fbc2b 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -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); |