[PATCH 1/2] flexcan: Use devm_ioremap_resource()

[PATCH 1/2] flexcan: Use devm_ioremap_resource()

[Fabio Estevam]

Using devm_ioremap_resource() can make the code simpler and smaller.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/net/can/flexcan.c | 46 +++++++++-------------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 7b0be09..1b07d75 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1001,7 +1001,6 @@ static int flexcan_probe(struct platform_device *pdev)
 	struct resource *mem;
 	struct clk *clk_ipg = NULL, *clk_per = NULL;
 	void __iomem *base;
-	resource_size_t mem_size;
 	int err, irq;
 	u32 clock_freq = 0;
 
@@ -1013,42 +1012,29 @@ static int flexcan_probe(struct platform_device *pdev)
 		clk_ipg = devm_clk_get(&pdev->dev, "ipg");
 		if (IS_ERR(clk_ipg)) {
 			dev_err(&pdev->dev, "no ipg clock defined\n");
-			err = PTR_ERR(clk_ipg);
-			goto failed_clock;
+			return PTR_ERR(clk_ipg);
 		}
 		clock_freq = clk_get_rate(clk_ipg);
 
 		clk_per = devm_clk_get(&pdev->dev, "per");
 		if (IS_ERR(clk_per)) {
 			dev_err(&pdev->dev, "no per clock defined\n");
-			err = PTR_ERR(clk_per);
-			goto failed_clock;
+			return PTR_ERR(clk_per);
 		}
 	}
 
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	irq = platform_get_irq(pdev, 0);
-	if (!mem || irq <= 0) {
-		err = -ENODEV;
-		goto failed_get;
-	}
+	if (irq <= 0)
+		return -ENODEV;
 
-	mem_size = resource_size(mem);
-	if (!request_mem_region(mem->start, mem_size, pdev->name)) {
-		err = -EBUSY;
-		goto failed_get;
-	}
-
-	base = ioremap(mem->start, mem_size);
-	if (!base) {
-		err = -ENOMEM;
-		goto failed_map;
-	}
+	base = devm_ioremap_resource(&pdev->dev, mem);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	dev = alloc_candev(sizeof(struct flexcan_priv), 1);
 	if (!dev) {
-		err = -ENOMEM;
-		goto failed_alloc;
+		return -ENOMEM;
 	}
 
 	of_id = of_match_device(flexcan_of_match, &pdev->dev);
@@ -1058,8 +1044,7 @@ static int flexcan_probe(struct platform_device *pdev)
 		devtype_data = (struct flexcan_devtype_data *)
 			pdev->id_entry->driver_data;
 	} else {
-		err = -ENODEV;
-		goto failed_devtype;
+		return -ENODEV;
 	}
 
 	dev->netdev_ops = &flexcan_netdev_ops;
@@ -1104,28 +1089,15 @@ static int flexcan_probe(struct platform_device *pdev)
 	return 0;
 
  failed_register:
- failed_devtype:
 	free_candev(dev);
- failed_alloc:
-	iounmap(base);
- failed_map:
-	release_mem_region(mem->start, mem_size);
- failed_get:
- failed_clock:
 	return err;
 }
 
 static int flexcan_remove(struct platform_device *pdev)
 {
 	struct net_device *dev = platform_get_drvdata(pdev);
-	struct flexcan_priv *priv = netdev_priv(dev);
-	struct resource *mem;
 
 	unregister_flexcandev(dev);
-	iounmap(priv->base);
-
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	release_mem_region(mem->start, resource_size(mem));
 
 	free_candev(dev);
 
-- 
1.8.1.2

[PATCH 2/2] flexcan: Add MODULE_ALIAS

[Fabio Estevam]

Add MODULE_ALIAS, so that auto module loading can work.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/net/can/flexcan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 0516fd8..cd25af0 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1156,6 +1156,7 @@ static struct platform_driver flexcan_driver = {
 
 module_platform_driver(flexcan_driver);
 
+MODULE_ALIAS("platform:" DRV_NAME);
 MODULE_AUTHOR("Sascha Hauer <kernel@pengutronix.de>, "
 	      "Marc Kleine-Budde <kernel@pengutronix.de>");
 MODULE_LICENSE("GPL v2");
-- 
1.8.1.2

Re: [PATCH 1/2] flexcan: Use devm_ioremap_resource()

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 3673 bytes --]

On 07/22/2013 04:23 PM, Fabio Estevam wrote:
> Using devm_ioremap_resource() can make the code simpler and smaller.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/net/can/flexcan.c | 46 +++++++++-------------------------------------
>  1 file changed, 9 insertions(+), 37 deletions(-)
> 
> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
> index 7b0be09..1b07d75 100644
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@ -1001,7 +1001,6 @@ static int flexcan_probe(struct platform_device *pdev)
>  	struct resource *mem;
>  	struct clk *clk_ipg = NULL, *clk_per = NULL;
>  	void __iomem *base;
> -	resource_size_t mem_size;
>  	int err, irq;
>  	u32 clock_freq = 0;
>  
> @@ -1013,42 +1012,29 @@ static int flexcan_probe(struct platform_device *pdev)
>  		clk_ipg = devm_clk_get(&pdev->dev, "ipg");
>  		if (IS_ERR(clk_ipg)) {
>  			dev_err(&pdev->dev, "no ipg clock defined\n");
> -			err = PTR_ERR(clk_ipg);
> -			goto failed_clock;
> +			return PTR_ERR(clk_ipg);
>  		}
>  		clock_freq = clk_get_rate(clk_ipg);
>  
>  		clk_per = devm_clk_get(&pdev->dev, "per");
>  		if (IS_ERR(clk_per)) {
>  			dev_err(&pdev->dev, "no per clock defined\n");
> -			err = PTR_ERR(clk_per);
> -			goto failed_clock;
> +			return PTR_ERR(clk_per);
>  		}
>  	}
>  
>  	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>  	irq = platform_get_irq(pdev, 0);
> -	if (!mem || irq <= 0) {
> -		err = -ENODEV;
> -		goto failed_get;
> -	}
> +	if (irq <= 0)
> +		return -ENODEV;
>  
> -	mem_size = resource_size(mem);
> -	if (!request_mem_region(mem->start, mem_size, pdev->name)) {
> -		err = -EBUSY;
> -		goto failed_get;
> -	}
> -
> -	base = ioremap(mem->start, mem_size);
> -	if (!base) {
> -		err = -ENOMEM;
> -		goto failed_map;
> -	}
> +	base = devm_ioremap_resource(&pdev->dev, mem);
> +	if (IS_ERR(base))
> +		return PTR_ERR(base);
>  
>  	dev = alloc_candev(sizeof(struct flexcan_priv), 1);
>  	if (!dev) {
> -		err = -ENOMEM;
> -		goto failed_alloc;
> +		return -ENOMEM;
>  	}
>  
>  	of_id = of_match_device(flexcan_of_match, &pdev->dev);
> @@ -1058,8 +1044,7 @@ static int flexcan_probe(struct platform_device *pdev)
>  		devtype_data = (struct flexcan_devtype_data *)
>  			pdev->id_entry->driver_data;
>  	} else {
> -		err = -ENODEV;
> -		goto failed_devtype;
> +		return -ENODEV;

You're missing "free_candev(dev);". If you move the alloc_candev after
the devtype, the code should be cleaner.

>  	}
>  
>  	dev->netdev_ops = &flexcan_netdev_ops;
> @@ -1104,28 +1089,15 @@ static int flexcan_probe(struct platform_device *pdev)
>  	return 0;
>  
>   failed_register:
> - failed_devtype:
>  	free_candev(dev);
> - failed_alloc:
> -	iounmap(base);
> - failed_map:
> -	release_mem_region(mem->start, mem_size);
> - failed_get:
> - failed_clock:
>  	return err;
>  }
>  
>  static int flexcan_remove(struct platform_device *pdev)
>  {
>  	struct net_device *dev = platform_get_drvdata(pdev);
> -	struct flexcan_priv *priv = netdev_priv(dev);
> -	struct resource *mem;
>  
>  	unregister_flexcandev(dev);
> -	iounmap(priv->base);
> -
> -	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	release_mem_region(mem->start, resource_size(mem));
>  
>  	free_candev(dev);
>  
> 
Otherwise, looks good.
Marc


-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: [PATCH 2/2] flexcan: Add MODULE_ALIAS

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

On 07/22/2013 04:23 PM, Fabio Estevam wrote:
> Add MODULE_ALIAS, so that auto module loading can work.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/net/can/flexcan.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
> index 0516fd8..cd25af0 100644
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@ -1156,6 +1156,7 @@ static struct platform_driver flexcan_driver = {
>  
>  module_platform_driver(flexcan_driver);
>  
> +MODULE_ALIAS("platform:" DRV_NAME);
>  MODULE_AUTHOR("Sascha Hauer <kernel@pengutronix.de>, "
>  	      "Marc Kleine-Budde <kernel@pengutronix.de>");
>  MODULE_LICENSE("GPL v2");
> 

Do we need a MODULE_ALIAS, if we have both a MODULE_DEVICE_TABLE(of,
flexcan_of_match) and MODULE_DEVICE_TABLE(platform, flexcan_id_table)?

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]