watchdog: sunxi_wdt: use of_device_get_match_data

Message ID 20171021174513.1653-1-clabbe.montjoie@gmail.com
State New
Headers show
Series
  • watchdog: sunxi_wdt: use of_device_get_match_data
Related show

Commit Message

Corentin Labbe Oct. 21, 2017, 5:45 p.m.
The usage of of_device_get_match_data reduce the code size a bit.
Furthermore, it prevents an improbable dereference when
of_match_device() return NULL.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>

---
 drivers/watchdog/sunxi_wdt.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

-- 
2.13.6

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Guenter Roeck Oct. 22, 2017, 5:44 p.m. | #1
On Sat, Oct 21, 2017 at 07:45:13PM +0200, Corentin Labbe wrote:
> The usage of of_device_get_match_data reduce the code size a bit.

> Furthermore, it prevents an improbable dereference when

> of_match_device() return NULL.

> 

> Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>


Reviewed-by: Guenter Roeck <linux@roeck-us.net>


> ---

>  drivers/watchdog/sunxi_wdt.c | 7 ++-----

>  1 file changed, 2 insertions(+), 5 deletions(-)

> 

> diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c

> index 9728fa32c357..802e31b1416d 100644

> --- a/drivers/watchdog/sunxi_wdt.c

> +++ b/drivers/watchdog/sunxi_wdt.c

> @@ -234,7 +234,6 @@ MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);

>  static int sunxi_wdt_probe(struct platform_device *pdev)

>  {

>  	struct sunxi_wdt_dev *sunxi_wdt;

> -	const struct of_device_id *device;

>  	struct resource *res;

>  	int err;

>  

> @@ -242,12 +241,10 @@ static int sunxi_wdt_probe(struct platform_device *pdev)

>  	if (!sunxi_wdt)

>  		return -EINVAL;

>  

> -	device = of_match_device(sunxi_wdt_dt_ids, &pdev->dev);

> -	if (!device)

> +	sunxi_wdt->wdt_regs = of_device_get_match_data(&pdev->dev);

> +	if (!sunxi_wdt->wdt_regs)

>  		return -ENODEV;

>  

> -	sunxi_wdt->wdt_regs = device->data;

> -

>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

>  	sunxi_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);

>  	if (IS_ERR(sunxi_wdt->wdt_base))

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index 9728fa32c357..802e31b1416d 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -234,7 +234,6 @@  MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
 static int sunxi_wdt_probe(struct platform_device *pdev)
 {
 	struct sunxi_wdt_dev *sunxi_wdt;
-	const struct of_device_id *device;
 	struct resource *res;
 	int err;
 
@@ -242,12 +241,10 @@  static int sunxi_wdt_probe(struct platform_device *pdev)
 	if (!sunxi_wdt)
 		return -EINVAL;
 
-	device = of_match_device(sunxi_wdt_dt_ids, &pdev->dev);
-	if (!device)
+	sunxi_wdt->wdt_regs = of_device_get_match_data(&pdev->dev);
+	if (!sunxi_wdt->wdt_regs)
 		return -ENODEV;
 
-	sunxi_wdt->wdt_regs = device->data;
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	sunxi_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
 	if (IS_ERR(sunxi_wdt->wdt_base))