On 24/07/17 15:55, Thierry Reding wrote:
> From: Thierry Reding <treding@xxxxxxxxxx>
>
> of_device_get_match_data() can never return NULL, therefore the check
> for NULL values is unnecessary.
>
> Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
> ---
> 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 *
Acked-by: Jon Hunter <jonathanh@xxxxxxxxxx>
Cheers
Jon
--
nvpublic
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
