From: Jiri Slaby <jirislaby@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jirislaby@gmail.com>
Subject: [PATCH 3/8] staging: agnx, remove memlens from probe
Date: Thu, 26 Mar 2009 09:34:08 +0100 [thread overview]
Message-ID: <1238056453-25653-3-git-send-email-jirislaby@gmail.com> (raw)
In-Reply-To: <1238056453-25653-1-git-send-email-jirislaby@gmail.com>
Pass 0 to pci_iomap instead. It will cope with that per se.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
drivers/staging/agnx/pci.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c
index f646211..f2fbd26 100644
--- a/drivers/staging/agnx/pci.c
+++ b/drivers/staging/agnx/pci.c
@@ -452,7 +452,6 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
{
struct ieee80211_hw *dev;
struct agnx_priv *priv;
- u32 mem_len0, mem_len1;
int err;
DECLARE_MAC_BUF(mac);
@@ -462,9 +461,6 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
return err;
}
- mem_len0 = pci_resource_len(pdev, 0);
- mem_len1 = pci_resource_len(pdev, 1);
-
err = pci_request_regions(pdev, "agnx-pci");
if (err) {
dev_err(&pdev->dev, "can't reserve PCI resources\n");
@@ -493,13 +489,13 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
spin_lock_init(&priv->lock);
priv->init_status = AGNX_UNINIT;
- priv->ctl = pci_iomap(pdev, 0, mem_len0);
+ priv->ctl = pci_iomap(pdev, 0, 0);
/* dev_dbg(&pdev->dev, "MEM1 mapped address is 0x%p\n", priv->ctl); */
if (!priv->ctl) {
dev_err(&pdev->dev, "can't map device memory\n");
goto err_free_dev;
}
- priv->data = pci_iomap(pdev, 1, mem_len1);
+ priv->data = pci_iomap(pdev, 1, 0);
if (!priv->data) {
dev_err(&pdev->dev, "can't map device memory\n");
goto err_iounmap2;
--
1.6.2
next prev parent reply other threads:[~2009-03-26 8:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-26 8:34 [PATCH 1/8] staging: comedi, remove interrupt.h Jiri Slaby
2009-03-26 8:34 ` [PATCH 2/8] staging: agnx, probe cleanup Jiri Slaby
2009-03-26 8:34 ` Jiri Slaby [this message]
2009-03-26 8:34 ` [PATCH 4/8] staging: agnx, fix fail paths in probe Jiri Slaby
2009-03-26 8:34 ` [PATCH 5/8] staging: agnx, fix bssid compiler warnings Jiri Slaby
2009-03-26 8:34 ` [PATCH 6/8] staging: meilhaus, switch to misc device Jiri Slaby
2009-03-26 8:34 ` [PATCH 7/8] staging: meilhaus, annotate cpi functions Jiri Slaby
2009-03-26 8:34 ` [PATCH 8/8] staging: meilhaus, move tables to .c Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1238056453-25653-3-git-send-email-jirislaby@gmail.com \
--to=jirislaby@gmail.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome