* [PATCH] bnx2: Clean up remaining iounmap
@ 2012-09-26 17:22 Neil Horman
2012-09-26 18:33 ` Michael Chan
0 siblings, 1 reply; 3+ messages in thread
From: Neil Horman @ 2012-09-26 17:22 UTC (permalink / raw)
To: netdev; +Cc: Neil Horman, Michael Chan, David S. Miller
commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from
using ioremap/iounmap to pci_iomap/pci_iounmap. They missed a spot in the error
path of bnx2_init_one though. This patch just cleans that up.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: Michael Chan <mcan@broadcom.com>
CC: "David S. Miller" <davem@davemloft.net>
---
drivers/net/ethernet/broadcom/bnx2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 79cebd8..e48312f 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8564,7 +8564,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return 0;
error:
- iounmap(bp->regview);
+ pci_iounmap(pdev, bp->regview);
pci_release_regions(pdev);
pci_disable_device(pdev);
pci_set_drvdata(pdev, NULL);
--
1.7.11.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] bnx2: Clean up remaining iounmap
2012-09-26 17:22 [PATCH] bnx2: Clean up remaining iounmap Neil Horman
@ 2012-09-26 18:33 ` Michael Chan
2012-09-27 23:19 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Michael Chan @ 2012-09-26 18:33 UTC (permalink / raw)
To: Neil Horman; +Cc: netdev, Michael Chan, David S. Miller
On Wed, 2012-09-26 at 13:22 -0400, Neil Horman wrote:
> commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from
> using ioremap/iounmap to pci_iomap/pci_iounmap. They missed a spot in the error
> path of bnx2_init_one though. This patch just cleans that up.
>
> Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
> CC: Michael Chan <mcan@broadcom.com>
> CC: "David S. Miller" <davem@davemloft.net>
Acked-by: Michael Chan <mchan@broadcom.com>
> ---
> drivers/net/ethernet/broadcom/bnx2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
> index 79cebd8..e48312f 100644
> --- a/drivers/net/ethernet/broadcom/bnx2.c
> +++ b/drivers/net/ethernet/broadcom/bnx2.c
> @@ -8564,7 +8564,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> return 0;
>
> error:
> - iounmap(bp->regview);
> + pci_iounmap(pdev, bp->regview);
> pci_release_regions(pdev);
> pci_disable_device(pdev);
> pci_set_drvdata(pdev, NULL);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] bnx2: Clean up remaining iounmap
2012-09-26 18:33 ` Michael Chan
@ 2012-09-27 23:19 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-09-27 23:19 UTC (permalink / raw)
To: mchan; +Cc: nhorman, netdev, mcan
From: "Michael Chan" <mchan@broadcom.com>
Date: Wed, 26 Sep 2012 11:33:53 -0700
> On Wed, 2012-09-26 at 13:22 -0400, Neil Horman wrote:
>> commit c0357e975afdbbedab5c662d19bef865f02adc17 modified bnx2 to switch from
>> using ioremap/iounmap to pci_iomap/pci_iounmap. They missed a spot in the error
>> path of bnx2_init_one though. This patch just cleans that up.
>>
>> Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
>> CC: Michael Chan <mcan@broadcom.com>
>> CC: "David S. Miller" <davem@davemloft.net>
>
> Acked-by: Michael Chan <mchan@broadcom.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-27 23:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-26 17:22 [PATCH] bnx2: Clean up remaining iounmap Neil Horman
2012-09-26 18:33 ` Michael Chan
2012-09-27 23:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).