i2c: busses: nomadik cleanups
Subsystems (2)
Andi Shyti
maintainercover i2c: busses: nomadik cleanups
Hi,
while browing the i2c code I spotted the unused goto. The other two patches come naturally.
Andi
Andi Shyti (3):
i2c: busses: i2c-nomadik: Remove unnecessary goto label
i2c: busses: nomadik: Use devm_clk_get_enabled()
i2c: busses: nomadik: Use dev_err_probe() whenever possible
drivers/i2c/busses/i2c-nomadik.c | 45 +++++++++----------------------- 1 file changed, 13 insertions(+), 32 deletions(-)
Signature · 1 line
2.40.1
Andi Shyti
maintainerPATCH 1/3 i2c: busses: i2c-nomadik: Remove unnecessary goto label
The err_no_mem goto label doesn't do anything. Remove it.
--- drivers/i2c/busses/i2c-nomadik.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
drivers/i2c/busses/i2c-nomadik.c +8 -13
@@ -971,10 +971,9 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)u32 max_fifo_threshold = (vendor->fifodepth /2 ) -1 ; dev =devm_kzalloc (&adev->dev,sizeof (*dev),GFP_KERNEL ); -if (!dev) { - ret = -ENOMEM ; - goto err_no_mem; - } +if (!dev) +return -ENOMEM ; + dev->vendor = vendor; dev->adev = adev;nmk_i2c_of_probe (np, dev);
@@ -995,30 +994,27 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) dev->virtbase =devm_ioremap (&adev->dev, adev->res.start,resource_size (&adev->res)); -if (!dev->virtbase) { - ret = -ENOMEM ; - goto err_no_mem; - } +if (!dev->virtbase) +return -ENOMEM ; dev->irq = adev->irq[0 ]; ret =devm_request_irq (&adev->dev, dev->irq, i2c_irq_handler,0 ,DRIVER_NAME , dev);if (ret) {dev_err (&adev->dev,"cannot claim the irq %d\n" , dev->irq); - goto err_no_mem; +return ret; } dev->clk =devm_clk_get (&adev->dev,NULL );if (IS_ERR (dev->clk)) {dev_err (&adev->dev,"could not get i2c clock\n" ); - ret =PTR_ERR (dev->clk); - goto err_no_mem; +return PTR_ERR (dev->clk); } ret =clk_prepare_enable (dev->clk);if (ret) {dev_err (&adev->dev,"can't prepare_enable clock\n" ); - goto err_no_mem; +return ret; }init_hw (dev);
@@ -1049,7 +1045,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) err_no_adap:clk_disable_unprepare (dev->clk); - err_no_mem:return ret; }
Signature · 1 line
2.40.1
Andi Shyti
maintainerPATCH 2/3 i2c: busses: nomadik: Use devm_clk_get_enabled()
In reply to Andi ShytiReplace the pair of functions, devm_clk_get() andclk_prepare_enable(), with a single functiondevm_clk_get_enabled().
--- drivers/i2c/busses/i2c-nomadik.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/i2c/busses/i2c-nomadik.c +3 -15
@@ -1005,18 +1005,12 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)return ret; } - dev->clk =devm_clk_get (&adev->dev,NULL ); + dev->clk =devm_clk_get_enabled (&adev->dev,NULL );if (IS_ERR (dev->clk)) { -dev_err (&adev->dev,"could not get i2c clock\n" ); +dev_err (&adev->dev,"could enable i2c clock\n" );return PTR_ERR (dev->clk); } - ret =clk_prepare_enable (dev->clk); -if (ret) { -dev_err (&adev->dev,"can't prepare_enable clock\n" ); -return ret; - } -init_hw (dev); adap = &dev->adap;
@@ -1037,16 +1031,11 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) ret =i2c_add_adapter (adap);if (ret) - goto err_no_adap; +return ret;pm_runtime_put (&adev->dev);return 0 ; - - err_no_adap: -clk_disable_unprepare (dev->clk); - -return ret; }static void nmk_i2c_remove (struct amba_device *adev)
@@ -1060,7 +1049,6 @@ static void nmk_i2c_remove(struct amba_device *adev)clear_all_interrupts (dev);/* disable the controller */ i2c_clr_bit (dev->virtbase +I2C_CR ,I2C_CR_PE ); -clk_disable_unprepare (dev->clk);release_mem_region (res->start,resource_size (res)); }
Signature · 1 line
2.40.1
Andi Shyti
maintainerPATCH 3/3 i2c: busses: nomadik: Use dev_err_probe() whenever possible
In reply to Andi ShytiMake use of dev_err_probe() in order to simplify the code and avoid printing when returning EPROBE_DEFER.
--- drivers/i2c/busses/i2c-nomadik.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-nomadik.c +6 -8
@@ -1000,16 +1000,14 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) dev->irq = adev->irq[0 ]; ret =devm_request_irq (&adev->dev, dev->irq, i2c_irq_handler,0 ,DRIVER_NAME , dev); -if (ret) { -dev_err (&adev->dev,"cannot claim the irq %d\n" , dev->irq); -return ret; - } +if (ret) +return dev_err_probe (&adev->dev, ret, +"cannot claim the irq %d\n" , dev->irq); dev->clk =devm_clk_get_enabled (&adev->dev,NULL ); -if (IS_ERR (dev->clk)) { -dev_err (&adev->dev,"could enable i2c clock\n" ); -return PTR_ERR (dev->clk); - } +if (IS_ERR (dev->clk)) +return dev_err_probe (&adev->dev,PTR_ERR (dev->clk), +"could enable i2c clock\n" );init_hw (dev);
Signature · 1 line
2.40.1
Quoted 2 lines · Andi Shyti
while browing the i2c code I spotted the unused goto. The other two patches come naturally.
Excellent patches Andi!
Yours,
Linus Walleij
Wolfram Sang
AppliedQuoted 5 lines · Andi Shyti
Hi,
while browing the i2c code I spotted the unused goto. The other two patches come naturally.
Quoted 7 lines
Andi
Andi Shyti (3):
i2c: busses: i2c-nomadik: Remove unnecessary goto label
i2c: busses: nomadik: Usedevm_clk_get_enabled()
i2c: busses: nomadik: Usedev_err_probe()whenever possible
Applied to for-next, thanks!