Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1694780

[PATCH 1/4] gpio: tegra: Remove unnecessary check

Show all headers | View raw

From: Thierry Reding <treding@nvidia.com>

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>
---
 drivers/gpio/gpio-tegra.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 17725c83821f..63ee221f9be9 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -566,7 +566,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;
@@ -575,17 +574,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);
@@ -625,7 +618,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 *
-- 
2.13.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] gpio: tegra: Remove unnecessary check Thierry Reding <thierry.reding@gmail.com> - 2017-07-24 17:00 +0200
  [PATCH 4/4] gpio: tegra: Use unsigned int where possible Thierry Reding <thierry.reding@gmail.com> - 2017-07-24 17:00 +0200
    Re: [PATCH 4/4] gpio: tegra: Use unsigned int where possible Jon Hunter <jonathanh@nvidia.com> - 2017-07-25 11:20 +0200
  [PATCH 3/4] gpio: tegra: Fix checkpatch warnings Thierry Reding <thierry.reding@gmail.com> - 2017-07-24 17:00 +0200
    Re: [PATCH 3/4] gpio: tegra: Fix checkpatch warnings Jon Hunter <jonathanh@nvidia.com> - 2017-07-25 10:40 +0200
  Re: [PATCH 1/4] gpio: tegra: Remove unnecessary check Jon Hunter <jonathanh@nvidia.com> - 2017-07-25 10:30 +0200
  Re: [PATCH 1/4] gpio: tegra: Remove unnecessary check Thierry Reding <thierry.reding@gmail.com> - 2017-07-31 13:10 +0200

csiph-web