* [PATCH v2 1/2] flexcan: Use devm_ioremap_resource()
@ 2013-07-22 15:41 Fabio Estevam
2013-07-22 15:41 ` [PATCH v2 2/2] flexcan: Check the return value from clk_prepare_enable() Fabio Estevam
2013-07-23 10:08 ` [PATCH v2 1/2] flexcan: Use devm_ioremap_resource() Marc Kleine-Budde
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2013-07-22 15:41 UTC (permalink / raw)
To: mkl; +Cc: linux-can, festevam, Fabio Estevam
Using devm_ioremap_resource() can make the code simpler and smaller.
Also, place alloc_candev() after of_match_device() to make error handling
easier.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Place alloc_candev() after of_match_device()
drivers/net/can/flexcan.c | 53 +++++++++++------------------------------------
1 file changed, 12 insertions(+), 41 deletions(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 7b0be09..9ca27e2 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,43 +1012,25 @@ 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;
- }
-
- mem_size = resource_size(mem);
- if (!request_mem_region(mem->start, mem_size, pdev->name)) {
- err = -EBUSY;
- goto failed_get;
- }
+ if (irq <= 0)
+ return -ENODEV;
- base = ioremap(mem->start, mem_size);
- if (!base) {
- err = -ENOMEM;
- goto failed_map;
- }
-
- dev = alloc_candev(sizeof(struct flexcan_priv), 1);
- if (!dev) {
- err = -ENOMEM;
- goto failed_alloc;
- }
+ base = devm_ioremap_resource(&pdev->dev, mem);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
of_id = of_match_device(flexcan_of_match, &pdev->dev);
if (of_id) {
@@ -1058,10 +1039,13 @@ 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 = alloc_candev(sizeof(struct flexcan_priv), 1);
+ if (!dev)
+ return -ENOMEM;
+
dev->netdev_ops = &flexcan_netdev_ops;
dev->irq = irq;
dev->flags |= IFF_ECHO;
@@ -1104,28 +1088,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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] flexcan: Check the return value from clk_prepare_enable()
2013-07-22 15:41 [PATCH v2 1/2] flexcan: Use devm_ioremap_resource() Fabio Estevam
@ 2013-07-22 15:41 ` Fabio Estevam
2013-07-23 10:08 ` [PATCH v2 1/2] flexcan: Use devm_ioremap_resource() Marc Kleine-Budde
1 sibling, 0 replies; 3+ messages in thread
From: Fabio Estevam @ 2013-07-22 15:41 UTC (permalink / raw)
To: mkl; +Cc: linux-can, festevam, Fabio Estevam
clk_prepare_enable() may fail, so let's check its return value and propagate it
in the case of error.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Newly introduced in this version
drivers/net/can/flexcan.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index da24ca5..03b93fa 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -850,8 +850,13 @@ static int flexcan_open(struct net_device *dev)
struct flexcan_priv *priv = netdev_priv(dev);
int err;
- clk_prepare_enable(priv->clk_ipg);
- clk_prepare_enable(priv->clk_per);
+ err = clk_prepare_enable(priv->clk_ipg);
+ if (err)
+ return err;
+
+ err = clk_prepare_enable(priv->clk_per);
+ if (err)
+ goto out_clk_per;
err = open_candev(dev);
if (err)
@@ -877,6 +882,7 @@ static int flexcan_open(struct net_device *dev)
close_candev(dev);
out:
clk_disable_unprepare(priv->clk_per);
+out_clk_per:
clk_disable_unprepare(priv->clk_ipg);
return err;
@@ -933,8 +939,13 @@ static int register_flexcandev(struct net_device *dev)
struct flexcan_regs __iomem *regs = priv->base;
u32 reg, err;
- clk_prepare_enable(priv->clk_ipg);
- clk_prepare_enable(priv->clk_per);
+ err = clk_prepare_enable(priv->clk_ipg);
+ if (err)
+ return err;
+
+ err = clk_prepare_enable(priv->clk_per);
+ if (err)
+ goto out_clk_per;
/* select "bus clock", chip must be disabled */
flexcan_chip_disable(priv);
@@ -968,6 +979,7 @@ static int register_flexcandev(struct net_device *dev)
/* disable core and turn off clocks */
flexcan_chip_disable(priv);
clk_disable_unprepare(priv->clk_per);
+out_clk_per:
clk_disable_unprepare(priv->clk_ipg);
return err;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/2] flexcan: Use devm_ioremap_resource()
2013-07-22 15:41 [PATCH v2 1/2] flexcan: Use devm_ioremap_resource() Fabio Estevam
2013-07-22 15:41 ` [PATCH v2 2/2] flexcan: Check the return value from clk_prepare_enable() Fabio Estevam
@ 2013-07-23 10:08 ` Marc Kleine-Budde
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2013-07-23 10:08 UTC (permalink / raw)
To: Fabio Estevam; +Cc: linux-can, festevam
[-- Attachment #1: Type: text/plain, Size: 673 bytes --]
On 07/22/2013 05:41 PM, Fabio Estevam wrote:
> Using devm_ioremap_resource() can make the code simpler and smaller.
>
> Also, place alloc_candev() after of_match_device() to make error handling
> easier.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Looks good, I've added a "can: " prefix to the subject while applying
the patch to linux-can-next.
thanks,
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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-23 10:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-22 15:41 [PATCH v2 1/2] flexcan: Use devm_ioremap_resource() Fabio Estevam
2013-07-22 15:41 ` [PATCH v2 2/2] flexcan: Check the return value from clk_prepare_enable() Fabio Estevam
2013-07-23 10:08 ` [PATCH v2 1/2] flexcan: Use devm_ioremap_resource() Marc Kleine-Budde
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.