Commit a505fe71 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

staging: agnx, remove memlens from probe 



Pass 0 to pci_iomap instead. It will cope with that per se.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9c2a6105

drivers/staging/agnx/pci.c

+2 −6
Original line number Diff line number Diff line
@@ -455,7 +455,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);
@@ -465,9 +464,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");
@@ -496,13 +492,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;