2009-06-25 07:12:49

by Michael Opdenacker

Subject: [PATCH 1/1] Minor code cleanup in drivers/net/r6040.c

Replaced '0' by 'bar' in the probe function.
The 'bar' variable was already set to '0' and is already
used in pci_iomap(). This is cleaner and improves code
consistency.

Signed-off-by: Michael Opdenacker <[email protected]>
---
drivers/net/r6040.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index ed63d23..b3197e9 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -1112,13 +1112,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
}

/* IO Size check */
- if (pci_resource_len(pdev, 0) < io_size) {
+ if (pci_resource_len(pdev, bar) < io_size) {
printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n");
err = -EIO;
goto err_out;
}

- pioaddr = pci_resource_start(pdev, 0); /* IO map base address */
+ pioaddr = pci_resource_start(pdev, bar); /* IO map base address */
pci_set_master(pdev);

dev = alloc_etherdev(sizeof(struct r6040_private));
--
1.6.0.4

2009-06-25 08:19:01

by Florian Fainelli

Subject: Re: [PATCH 1/1] Minor code cleanup in drivers/net/r6040.c

Le Thursday 25 June 2009 09:05:09 Michael Opdenacker, vous avez écrit :
> Replaced '0' by 'bar' in the probe function.
> The 'bar' variable was already set to '0' and is already
> used in pci_iomap(). This is cleaner and improves code
> consistency.
>
> Signed-off-by: Michael Opdenacker <[email protected]>

Acked-by: Florian Fainelli <[email protected]>

> ---
> drivers/net/r6040.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
> index ed63d23..b3197e9 100644
> --- a/drivers/net/r6040.c
> +++ b/drivers/net/r6040.c
> @@ -1112,13 +1112,13 @@ static int __devinit r6040_init_one(struct pci_dev
> *pdev, }
>
> /* IO Size check */
> - if (pci_resource_len(pdev, 0) < io_size) {
> + if (pci_resource_len(pdev, bar) < io_size) {
> printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n");
> err = -EIO;
> goto err_out;
> }
>
> - pioaddr = pci_resource_start(pdev, 0); /* IO map base address */
> + pioaddr = pci_resource_start(pdev, bar); /* IO map base address */
> pci_set_master(pdev);
>
> dev = alloc_etherdev(sizeof(struct r6040_private));



--
Best regards, Florian Fainelli
Email : [email protected]
http://openwrt.org
-------------------------------

2009-07-06 02:48:21

by David Miller

Subject: Re: [PATCH 1/1] Minor code cleanup in drivers/net/r6040.c

From: Florian Fainelli <[email protected]>
Date: Thu, 25 Jun 2009 10:18:40 +0200

> Le Thursday 25 June 2009 09:05:09 Michael Opdenacker, vous avez ?crit?:
>> Replaced '0' by 'bar' in the probe function.
>> The 'bar' variable was already set to '0' and is already
>> used in pci_iomap(). This is cleaner and improves code
>> consistency.
>>
>> Signed-off-by: Michael Opdenacker <[email protected]>
>
> Acked-by: Florian Fainelli <[email protected]>

Applied to net-next-2.6