summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2017-07-24 16:55:05 +0200
committerLinus Walleij <linus.walleij@linaro.org>2017-08-14 15:01:13 +0200
commit20133bd5ebbb58cdf224c769dea2a475c746bc1a (patch)
tree7f94fcd449aa03d611c6e3ff1ecee3aa29b7ea14
parente3b445d77819b8fb41e3ceae9dbd49c8c8427c5d (diff)
downloadblackbird-obmc-linux-20133bd5ebbb58cdf224c769dea2a475c746bc1a.tar.gz
blackbird-obmc-linux-20133bd5ebbb58cdf224c769dea2a475c746bc1a.zip
gpio: tegra: Remove unnecessary check
of_device_get_match_data() can never return NULL, therefore the check for NULL values is unnecessary. Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-tegra.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 755d3b61fbb7..c68455b7e26e 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -567,7 +567,6 @@ static struct lock_class_key gpio_lock_class;
static int tegra_gpio_probe(struct platform_device *pdev)
{
- const struct tegra_gpio_soc_config *config;
struct tegra_gpio_info *tgi;
struct resource *res;
struct tegra_gpio_bank *bank;
@@ -576,17 +575,11 @@ static int tegra_gpio_probe(struct platform_device *pdev)
int i;
int j;
- config = of_device_get_match_data(&pdev->dev);
- if (!config) {
- dev_err(&pdev->dev, "Error: No device match found\n");
- return -ENODEV;
- }
-
tgi = devm_kzalloc(&pdev->dev, sizeof(*tgi), GFP_KERNEL);
if (!tgi)
return -ENODEV;
- tgi->soc = config;
+ tgi->soc = of_device_get_match_data(&pdev->dev);
tgi->dev = &pdev->dev;
ret = platform_irq_count(pdev);
@@ -626,7 +619,7 @@ static int tegra_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, tgi);
- if (config->debounce_supported)
+ if (tgi->soc->debounce_supported)
tgi->gc.set_config = tegra_gpio_set_config;
tgi->bank_info = devm_kzalloc(&pdev->dev, tgi->bank_count *
OpenPOWER on IntegriCloud