diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-27 14:08:32 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-09 17:12:27 -0500 |
commit | 75beb268550d11e66c372dd6da309dce659da7f7 (patch) | |
tree | 269f8b7be39f12737cb1d40d8f93a6deba4af851 /drivers/tty | |
parent | 46778bcad73d0546c6fac24110dba5110902141f (diff) |
serial: mxs-auart: Use devm_clk_get()
By using devm_clk_get() we can have a shorter and cleaner code.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/mxs-auart.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 0b5f0ead6b73..9309082e4937 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
@@ -1246,15 +1246,14 @@ static int mxs_auart_probe(struct platform_device *pdev) | |||
1246 | s->devtype = pdev->id_entry->driver_data; | 1246 | s->devtype = pdev->id_entry->driver_data; |
1247 | } | 1247 | } |
1248 | 1248 | ||
1249 | s->clk = clk_get(&pdev->dev, NULL); | 1249 | s->clk = devm_clk_get(&pdev->dev, NULL); |
1250 | if (IS_ERR(s->clk)) | 1250 | if (IS_ERR(s->clk)) |
1251 | return PTR_ERR(s->clk); | 1251 | return PTR_ERR(s->clk); |
1252 | 1252 | ||
1253 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1253 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1254 | if (!r) { | 1254 | if (!r) |
1255 | ret = -ENXIO; | 1255 | return -ENXIO; |
1256 | goto out_free_clk; | 1256 | |
1257 | } | ||
1258 | 1257 | ||
1259 | s->port.mapbase = r->start; | 1258 | s->port.mapbase = r->start; |
1260 | s->port.membase = ioremap(r->start, resource_size(r)); | 1259 | s->port.membase = ioremap(r->start, resource_size(r)); |
@@ -1271,7 +1270,7 @@ static int mxs_auart_probe(struct platform_device *pdev) | |||
1271 | s->port.irq = s->irq; | 1270 | s->port.irq = s->irq; |
1272 | ret = request_irq(s->irq, mxs_auart_irq_handle, 0, dev_name(&pdev->dev), s); | 1271 | ret = request_irq(s->irq, mxs_auart_irq_handle, 0, dev_name(&pdev->dev), s); |
1273 | if (ret) | 1272 | if (ret) |
1274 | goto out_free_clk; | 1273 | return ret; |
1275 | 1274 | ||
1276 | platform_set_drvdata(pdev, s); | 1275 | platform_set_drvdata(pdev, s); |
1277 | 1276 | ||
@@ -1306,8 +1305,6 @@ out_free_gpio_irq: | |||
1306 | out_free_irq: | 1305 | out_free_irq: |
1307 | auart_port[pdev->id] = NULL; | 1306 | auart_port[pdev->id] = NULL; |
1308 | free_irq(s->irq, s); | 1307 | free_irq(s->irq, s); |
1309 | out_free_clk: | ||
1310 | clk_put(s->clk); | ||
1311 | return ret; | 1308 | return ret; |
1312 | } | 1309 | } |
1313 | 1310 | ||
@@ -1320,7 +1317,6 @@ static int mxs_auart_remove(struct platform_device *pdev) | |||
1320 | auart_port[pdev->id] = NULL; | 1317 | auart_port[pdev->id] = NULL; |
1321 | 1318 | ||
1322 | mxs_auart_free_gpio_irq(s); | 1319 | mxs_auart_free_gpio_irq(s); |
1323 | clk_put(s->clk); | ||
1324 | free_irq(s->irq, s); | 1320 | free_irq(s->irq, s); |
1325 | 1321 | ||
1326 | return 0; | 1322 | return 0; |