i2c: ibm_iic: use devm and get irq in probe
cover i2c: ibm_iic: use devm and get irq in probe
Simplifies probe slightly and handles potential -EPROBE_DEFER a bit better.
Rosen Penev (3):
i2c: ibm_iic: ioremap with platform pointer
i2c: ibm_iic: get the irq early in probe
i2c: ibm_iic: use devm for main allocation
drivers/i2c/busses/i2c-ibm_iic.c | 44 ++++++++++++-------------------- 1 file changed, 17 insertions(+), 27 deletions(-)
Signature · 1 line
2.55.0
PATCH 1/3 i2c: ibm_iic: ioremap with platform pointer
devm_platform_ioremap_resource only needs a platform_device pointer and calling it early allows handling potential -EPROBE_DEFER.
--- drivers/i2c/busses/i2c-ibm_iic.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-ibm_iic.c +6 -10
@@ -684,21 +684,21 @@ static int iic_probe(struct platform_device *ofdev)struct device_node *np = ofdev->dev.of_node;struct ibm_iic_private *dev;struct i2c_adapter *adap; +void __iomem *vaddr;const u32 *freq;int ret; + vaddr =devm_platform_ioremap_resource (ofdev,0 ); +if (IS_ERR (vaddr)) +return PTR_ERR (vaddr); + dev =kzalloc_obj (*dev);if (!dev)return -ENOMEM ;platform_set_drvdata (ofdev, dev); - dev->vaddr =of_iomap (np,0 ); -if (dev->vaddr ==NULL ) { -dev_err (&ofdev->dev,"failed to iomap device\n" ); - ret = -ENXIO ; - goto error_cleanup; - } + dev->vaddr = vaddr;init_waitqueue_head (&dev->wq);
@@ -751,9 +751,6 @@ static int iic_probe(struct platform_device *ofdev)free_irq (dev->irq, dev); } -if (dev->vaddr) -iounmap (dev->vaddr); -kfree (dev);return ret; }
@@ -772,7 +769,6 @@ static void iic_remove(struct platform_device *ofdev)free_irq (dev->irq, dev); } -iounmap (dev->vaddr);kfree (dev); }
Signature · 1 line
2.55.0
Re: [PATCH 1/3] i2c: ibm_iic: ioremap with platform pointer
Quoted 2 lines
devm_platform_ioremap_resourceonly needs aplatform_devicepointer and calling it early allows handling potential -EPROBE_DEFER.
I find the change description improvable.
See also once more:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.2#n94
Regards,
Markus
Andi Shyti
maintainerRe: [PATCH 1/3] i2c: ibm_iic: ioremap with platform pointer
In reply to Rosen PenevHi Rosen,
Quoted 2 lines · Rosen Penev
devm_platform_ioremap_resourceonly needs aplatform_devicepointer and calling it early allows handling potential -EPROBE_DEFER.
Please improve the commit message as suggested by Markus. Please use the imperative form, it's not just a formality, but it helps understand what you actually did (I'm using the imperative form here sothat you clearly understand me).
Besides devm_platform_ioremap_resource() does not return EPROBE_DEFER.
Quoted 1 line
Signed-off-by Rosen Penev <[email protected]>
...
drivers/i2c/busses/i2c-ibm_iic.c static int iic_probe(struct platform_device *ofdev) · line 755
Quoted 6 lines
drivers/i2c/busses/i2c-ibm_iic.c +0
-2@@ -751,9 +751,6 @@ static int iic_probe(struct platform_device *ofdev)free_irq (dev->irq, dev); } -if (dev->vaddr) -iounmap (dev->vaddr);
I think now you can remove linux/of_address.h
Thanks,
Andi
Quoted 15 lines
drivers/i2c/busses/i2c-ibm_iic.c +0
-2-kfree (dev);return ret; }@@ -772,7 +769,6 @@ static void iic_remove(struct platform_device *ofdev)free_irq (dev->irq, dev); } -iounmap (dev->vaddr);kfree (dev); }Signature · 1 line
2.55.0
PATCH 2/3 i2c: ibm_iic: get the irq early in probe
In reply to Rosen Penevplatform_get_irq() can return -EPROBE_DEFER, unlike irq_of_map_and_parse(), which helps reduce work done during probe.
--- drivers/i2c/busses/i2c-ibm_iic.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/i2c/busses/i2c-ibm_iic.c +10 -13
@@ -649,20 +649,11 @@ static inline u8 iic_clckdiv(unsigned int opb) }static int iic_request_irq (struct platform_device *ofdev, -struct ibm_iic_private *dev) +struct ibm_iic_private *dev,int irq) { -struct device_node *np = ofdev->dev.of_node; -int irq; -if (iic_force_poll)return 0 ; - irq =irq_of_parse_and_map (np,0 ); -if (!irq) { -dev_err (&ofdev->dev,"irq_of_parse_and_map failed\n" ); -return 0 ; - } -/* Disable interrupts until we finish initialization, assumes * level-sensitive IRQ setup... */
@@ -686,12 +677,19 @@ static int iic_probe(struct platform_device *ofdev)struct i2c_adapter *adap;void __iomem *vaddr;const u32 *freq; +int irq;int ret; vaddr =devm_platform_ioremap_resource (ofdev,0 );if (IS_ERR (vaddr))return PTR_ERR (vaddr); + irq =platform_get_irq (ofdev,0 ); +if (irq == -EPROBE_DEFER ) +return irq; +if (irq <0 ) +dev_warn (&ofdev->dev,"using polling mode\n" ); + dev =kzalloc_obj (*dev);if (!dev)return -ENOMEM ;
@@ -702,9 +700,8 @@ static int iic_probe(struct platform_device *ofdev)init_waitqueue_head (&dev->wq); - dev->irq =iic_request_irq (ofdev, dev); -if (!dev->irq) -dev_warn (&ofdev->dev,"using polling mode\n" ); +if (irq >0 ) + dev->irq =iic_request_irq (ofdev, dev, irq);/* Board specific settings */ if (iic_force_fast ||of_get_property (np,"fast-mode" ,NULL ))
Signature · 1 line
2.55.0
Andi Shyti
maintainerRe: [PATCH 2/3] i2c: ibm_iic: get the irq early in probe
Hi Rosen,
Quoted 2 lines · Rosen Penev
platform_get_irq()can return -EPROBE_DEFER, unlikeirq_of_map_and_parse(), which helps reduce work done during probe.
same comment for the commit log goes here.
Quoted 1 line
Signed-off-by Rosen Penev <[email protected]>
...
Quoted 4 lines
drivers/i2c/busses/i2c-ibm_iic.c +0
-0@@ -686,12 +677,19 @@ static int iic_probe(struct platform_device *ofdev)struct i2c_adapter *adap;void __iomem *vaddr;const u32 *freq;
drivers/i2c/busses/i2c-ibm_iic.c static int iic_probe(struct platform_device *ofdev) · line 689
Quoted 10 lines
drivers/i2c/busses/i2c-ibm_iic.c +4
-0+int irq;int ret; vaddr =devm_platform_ioremap_resource (ofdev,0 );if (IS_ERR (vaddr))return PTR_ERR (vaddr); + irq =platform_get_irq (ofdev,0 ); +if (irq == -EPROBE_DEFER ) +return irq;
if iic_force_poll is set true, there is no reason to return if platform_get_irq() fails with EPROBE_DEFER. Check for iic_force_poll first.
Andi
Quoted 3 lines
drivers/i2c/busses/i2c-ibm_iic.c +3
-0+if (irq <0 ) +dev_warn (&ofdev->dev,"using polling mode\n" ); +
PATCH 3/3 i2c: ibm_iic: use devm for main allocation
In reply to Rosen PenevAllows getting rid of kfree in failure and remove paths.
--- drivers/i2c/busses/i2c-ibm_iic.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/i2c/busses/i2c-ibm_iic.c +1 -4
@@ -690,7 +690,7 @@ static int iic_probe(struct platform_device *ofdev)if (irq <0 )dev_warn (&ofdev->dev,"using polling mode\n" ); - dev =kzalloc_obj (*dev); + dev =devm_kzalloc (&ofdev->dev,sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ;
@@ -748,7 +748,6 @@ static int iic_probe(struct platform_device *ofdev)free_irq (dev->irq, dev); } -kfree (dev);return ret; }
@@ -765,8 +764,6 @@ static void iic_remove(struct platform_device *ofdev)iic_interrupt_mode (dev,0 );free_irq (dev->irq, dev); } - -kfree (dev); }static const struct of_device_id ibm_iic_match[] = {
Signature · 1 line
2.55.0
Re: [PATCH 3/3] i2c: ibm_iic: use devm for main allocation
Quoted 1 line
Allows getting rid of kfree in failure and remove paths.
Will another improved change description become more desirable?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.2#n94
Regards,
Markus
Andi Shyti
maintainerRe: [PATCH 3/3] i2c: ibm_iic: use devm for main allocation
In reply to Rosen PenevHi Rosen,
Quoted 1 line · Rosen Penev
Allows getting rid of kfree in failure and remove paths.
the patch is good, but as you are going to resend, the comment for the commit log is still valid.
Thanks,
Andi