Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef38fa77 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: remove superfluous doorbell map 



For NX3031 pci doorbells are not used. If unnecessary mapping
of doorbell space fails, pci probe bails out.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad7bf428

drivers/net/netxen/netxen_nic_main.c

+7 −5
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 




	u8 __iomem *db_ptr = NULL;

	unsigned long mem_base, mem_len, db_base, db_len, pci_len0 = 0;

	unsigned long mem_base, mem_len, db_base, db_len = 0, pci_len0 = 0;

	int i = 0, err;

	int first_driver, first_boot;

	u32 val;
@@ -611,6 +611,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	dev_info(&pdev->dev, "%dMB memory map\n", (int)(mem_len>>20));



	if (NX_IS_REVISION_P3(revision_id))

		goto skip_doorbell;



	db_base = pci_resource_start(pdev, 4);	/* doorbell is on bar 4 */

	db_len = pci_resource_len(pdev, 4);
@@ -620,8 +623,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		err = -EIO;

		goto err_out_iounmap;

	}

	DPRINTK(INFO, "doorbell ioremap from %lx a size of %lx\n", db_base,

		db_len);



	db_ptr = ioremap(db_base, NETXEN_DB_MAPSIZE_BYTES);

	if (!db_ptr) {
@@ -630,8 +631,8 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		err = -EIO;

		goto err_out_iounmap;

	}

	DPRINTK(INFO, "doorbell ioremaped at %p\n", db_ptr);



skip_doorbell:

	adapter->ahw.pci_base0 = mem_ptr0;

	adapter->ahw.pci_len0 = pci_len0;

	adapter->ahw.first_page_group_start = first_page_group_start;
@@ -941,8 +942,9 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) 
	if (adapter->flags & NETXEN_NIC_MSI_ENABLED)

		pci_disable_msi(pdev);



	iounmap(adapter->ahw.db_base);

	iounmap(adapter->ahw.pci_base0);

	if (adapter->ahw.db_base != NULL)

		iounmap(adapter->ahw.db_base);

	if (adapter->ahw.pci_base1 != NULL)

		iounmap(adapter->ahw.pci_base1);

	if (adapter->ahw.pci_base2 != NULL)