[PATCH net-next 1/2] net: natsemi: xtsonic: switch to use platform_get_irq()

[PATCH net-next 1/2] net: natsemi: xtsonic: switch to use platform_get_irq()

[Yang Yingliang]

Switch to use platform_get_irq() which supports more cases.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/natsemi/xtsonic.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index 52fef34d43f9..ffb3814c54cb 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -201,14 +201,17 @@ int xtsonic_probe(struct platform_device *pdev)
 {
 	struct net_device *dev;
 	struct sonic_local *lp;
-	struct resource *resmem, *resirq;
+	struct resource *resmem;
+	int irq;
 	int err = 0;
 
 	if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL)
 		return -ENODEV;
 
-	if ((resirq = platform_get_resource(pdev, IORESOURCE_IRQ, 0)) == NULL)
-		return -ENODEV;
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return irq;
+
 
 	if ((dev = alloc_etherdev(sizeof(struct sonic_local))) == NULL)
 		return -ENOMEM;
@@ -219,7 +222,7 @@ int xtsonic_probe(struct platform_device *pdev)
 	SET_NETDEV_DEV(dev, &pdev->dev);
 
 	dev->base_addr = resmem->start;
-	dev->irq = resirq->start;
+	dev->irq = irq;
 
 	if ((err = sonic_probe1(dev)))
 		goto out;
-- 
2.25.1

[PATCH net-next 2/2] net: natsemi: xtsonic: use pr_err()

[Yang Yingliang]

Use pr_err() instead of printk(KERN_ERR ...).

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/natsemi/xtsonic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
index ffb3814c54cb..a31a67edc58c 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -90,7 +90,7 @@ static int xtsonic_open(struct net_device *dev)
 
 	retval = request_irq(dev->irq, sonic_interrupt, 0, "sonic", dev);
 	if (retval) {
-		printk(KERN_ERR "%s: unable to get IRQ %d.\n",
+		pr_err("%s: unable to get IRQ %d.\n",
 		       dev->name, dev->irq);
 		return -EAGAIN;
 	}
-- 
2.25.1

Re: [PATCH net-next 1/2] net: natsemi: xtsonic: switch to use platform_get_irq()

[Jakub Kicinski]

On Tue, 25 Oct 2022 11:12:35 +0800 Yang Yingliang wrote:
> Switch to use platform_get_irq() which supports more cases.

More cases of what? You need to explain what you're trying to achieve
and why you're touching this old driver.

> diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
> index 52fef34d43f9..ffb3814c54cb 100644
> --- a/drivers/net/ethernet/natsemi/xtsonic.c
> +++ b/drivers/net/ethernet/natsemi/xtsonic.c
> @@ -201,14 +201,17 @@ int xtsonic_probe(struct platform_device *pdev)
>  {
>  	struct net_device *dev;
>  	struct sonic_local *lp;
> -	struct resource *resmem, *resirq;
> +	struct resource *resmem;
> +	int irq;
>  	int err = 0;

The variable declaration lines should be sorted longest to shortest.

>  	if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL)
>  		return -ENODEV;
>  
> -	if ((resirq = platform_get_resource(pdev, IORESOURCE_IRQ, 0)) == NULL)
> -		return -ENODEV;
> +	irq = platform_get_irq(pdev, 0);
> +	if (irq < 0)
> +		return irq;
> +
>  

extra new line

Re: [PATCH net-next 2/2] net: natsemi: xtsonic: use pr_err()

[Jakub Kicinski]

On Tue, 25 Oct 2022 11:12:36 +0800 Yang Yingliang wrote:
> Use pr_err() instead of printk(KERN_ERR ...).

To what gain?  Please don't pointlessly futz with old code.

Re: [PATCH net-next 1/2] net: natsemi: xtsonic: switch to use platform_get_irq()

[Yang Yingliang]

On 2022/10/25 12:11, Jakub Kicinski wrote:
> On Tue, 25 Oct 2022 11:12:35 +0800 Yang Yingliang wrote:
>> Switch to use platform_get_irq() which supports more cases.
> More cases of what? You need to explain what you're trying to achieve
> and why you're touching this old driver.
platform_get_irq() is a common API which calls of_irq_get(), 
platform_get_resource() or
acpi_dev_gpio_irq_get() to get irq, and it returns exactly error code.

Thanks,
Yang
>
>> diff --git a/drivers/net/ethernet/natsemi/xtsonic.c b/drivers/net/ethernet/natsemi/xtsonic.c
>> index 52fef34d43f9..ffb3814c54cb 100644
>> --- a/drivers/net/ethernet/natsemi/xtsonic.c
>> +++ b/drivers/net/ethernet/natsemi/xtsonic.c
>> @@ -201,14 +201,17 @@ int xtsonic_probe(struct platform_device *pdev)
>>   {
>>   	struct net_device *dev;
>>   	struct sonic_local *lp;
>> -	struct resource *resmem, *resirq;
>> +	struct resource *resmem;
>> +	int irq;
>>   	int err = 0;
> The variable declaration lines should be sorted longest to shortest.
>
>>   	if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL)
>>   		return -ENODEV;
>>   
>> -	if ((resirq = platform_get_resource(pdev, IORESOURCE_IRQ, 0)) == NULL)
>> -		return -ENODEV;
>> +	irq = platform_get_irq(pdev, 0);
>> +	if (irq < 0)
>> +		return irq;
>> +
>>   
> extra new line
> .