* [PATCH] ata: pata_octeon_cf: Use common error handling code in octeon_cf_probe()
@ 2024-09-17 11:50 Markus Elfring
2024-09-17 17:43 ` Sergey Shtylyov
0 siblings, 1 reply; 4+ messages in thread
From: Markus Elfring @ 2024-09-17 11:50 UTC (permalink / raw)
To: linux-ide, Damien Le Moal, Niklas Cassel, Sergey Shtylyov; +Cc: LKML
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 17 Sep 2024 13:43:24 +0200
Add a label so that a bit of exception handling can be better reused
in a subsequent if branch of this function implementation.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/ata/pata_octeon_cf.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index 0bb9607e7348..62289f6aef95 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -848,14 +848,13 @@ static int octeon_cf_probe(struct platform_device *pdev)
struct resource *res_dma;
int i;
res_dma = platform_get_resource(dma_dev, IORESOURCE_MEM, 0);
- if (!res_dma) {
- put_device(&dma_dev->dev);
- of_node_put(dma_node);
- return -EINVAL;
- }
+ if (!res_dma)
+ goto put_device;
+
cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
resource_size(res_dma));
if (!cf_port->dma_base) {
+put_device:
put_device(&dma_dev->dev);
of_node_put(dma_node);
return -EINVAL;
--
2.46.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ata: pata_octeon_cf: Use common error handling code in octeon_cf_probe()
2024-09-17 11:50 [PATCH] ata: pata_octeon_cf: Use common error handling code in octeon_cf_probe() Markus Elfring
@ 2024-09-17 17:43 ` Sergey Shtylyov
2024-09-17 20:44 ` Sergey Shtylyov
0 siblings, 1 reply; 4+ messages in thread
From: Sergey Shtylyov @ 2024-09-17 17:43 UTC (permalink / raw)
To: Markus Elfring, linux-ide, Damien Le Moal, Niklas Cassel; +Cc: LKML
On 9/17/24 14:50, Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 17 Sep 2024 13:43:24 +0200
>
> Add a label so that a bit of exception handling can be better reused
s/exception/error/.
> in a subsequent if branch of this function implementation.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/ata/pata_octeon_cf.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
> index 0bb9607e7348..62289f6aef95 100644
> --- a/drivers/ata/pata_octeon_cf.c
> +++ b/drivers/ata/pata_octeon_cf.c
> @@ -848,14 +848,13 @@ static int octeon_cf_probe(struct platform_device *pdev)
> struct resource *res_dma;
> int i;
> res_dma = platform_get_resource(dma_dev, IORESOURCE_MEM, 0);
> - if (!res_dma) {
> - put_device(&dma_dev->dev);
> - of_node_put(dma_node);
> - return -EINVAL;
> - }
> + if (!res_dma)
> + goto put_device;
> +
> cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
> resource_size(res_dma));
> if (!cf_port->dma_base) {
> +put_device:
Ugh... :-/
Please use the new-fangled *devm_platform_ioremap_resource() instead of those
old-fashioned APIs.
[...]
MBR, Sergey
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ata: pata_octeon_cf: Use common error handling code in octeon_cf_probe()
2024-09-17 17:43 ` Sergey Shtylyov
@ 2024-09-17 20:44 ` Sergey Shtylyov
2024-09-18 12:35 ` Sergey Shtylyov
0 siblings, 1 reply; 4+ messages in thread
From: Sergey Shtylyov @ 2024-09-17 20:44 UTC (permalink / raw)
To: Markus Elfring, linux-ide, Damien Le Moal, Niklas Cassel; +Cc: LKML
On 9/17/24 20:43, Sergey Shtylyov wrote:
>> From: Markus Elfring <elfring@users.sourceforge.net>
>> Date: Tue, 17 Sep 2024 13:43:24 +0200
>>
>> Add a label so that a bit of exception handling can be better reused
>
> s/exception/error/.
>
>> in a subsequent if branch of this function implementation.
>>
>> This issue was detected by using the Coccinelle software.
>>
>> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
>> ---
>> drivers/ata/pata_octeon_cf.c | 9 ++++-----
>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
>> index 0bb9607e7348..62289f6aef95 100644
>> --- a/drivers/ata/pata_octeon_cf.c
>> +++ b/drivers/ata/pata_octeon_cf.c
>> @@ -848,14 +848,13 @@ static int octeon_cf_probe(struct platform_device *pdev)
>> struct resource *res_dma;
>> int i;
>> res_dma = platform_get_resource(dma_dev, IORESOURCE_MEM, 0);
>> - if (!res_dma) {
>> - put_device(&dma_dev->dev);
>> - of_node_put(dma_node);
>> - return -EINVAL;
>> - }
>> + if (!res_dma)
>> + goto put_device;
>> +
>> cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
>> resource_size(res_dma));
>> if (!cf_port->dma_base) {
>> +put_device:
>
> Ugh... :-/
> Please use the new-fangled *devm_platform_ioremap_resource() instead of those
> old-fashioned APIs.
Another option is to place this error patch somewhere at the end
of this function but I think I prefer the new APIs.
[...]
MBR, Sergey
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ata: pata_octeon_cf: Use common error handling code in octeon_cf_probe()
2024-09-17 20:44 ` Sergey Shtylyov
@ 2024-09-18 12:35 ` Sergey Shtylyov
0 siblings, 0 replies; 4+ messages in thread
From: Sergey Shtylyov @ 2024-09-18 12:35 UTC (permalink / raw)
To: Markus Elfring, linux-ide, Damien Le Moal, Niklas Cassel; +Cc: LKML
On 9/17/24 23:44, Sergey Shtylyov wrote:
[...]
>>> From: Markus Elfring <elfring@users.sourceforge.net>
>>> Date: Tue, 17 Sep 2024 13:43:24 +0200
>>>
>>> Add a label so that a bit of exception handling can be better reused
>>
>> s/exception/error/.
>>
>>> in a subsequent if branch of this function implementation.
>>>
>>> This issue was detected by using the Coccinelle software.
>>>
>>> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
>>> ---
>>> drivers/ata/pata_octeon_cf.c | 9 ++++-----
>>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
>>> index 0bb9607e7348..62289f6aef95 100644
>>> --- a/drivers/ata/pata_octeon_cf.c
>>> +++ b/drivers/ata/pata_octeon_cf.c
>>> @@ -848,14 +848,13 @@ static int octeon_cf_probe(struct platform_device *pdev)
>>> struct resource *res_dma;
>>> int i;
>>> res_dma = platform_get_resource(dma_dev, IORESOURCE_MEM, 0);
>>> - if (!res_dma) {
>>> - put_device(&dma_dev->dev);
>>> - of_node_put(dma_node);
>>> - return -EINVAL;
>>> - }
>>> + if (!res_dma)
>>> + goto put_device;
>>> +
>>> cf_port->dma_base = (u64)devm_ioremap(&pdev->dev, res_dma->start,
>>> resource_size(res_dma));
>>> if (!cf_port->dma_base) {
>>> +put_device:
>>
>> Ugh... :-/
>> Please use the new-fangled *devm_platform_ioremap_resource() instead of those
Ugh, s/*//...
>> old-fashioned APIs.
>
> Another option is to place this error patch somewhere at the end
s/patch/path/, of course... :-)
> of this function but I think I prefer the new APIs.
[...]
MBR, Sergey
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-18 12:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-17 11:50 [PATCH] ata: pata_octeon_cf: Use common error handling code in octeon_cf_probe() Markus Elfring
2024-09-17 17:43 ` Sergey Shtylyov
2024-09-17 20:44 ` Sergey Shtylyov
2024-09-18 12:35 ` Sergey Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox