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

Commit d9bd00a1 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller
Browse files

forcedeth: Cleanup MSI-X to MSI to INTx fallback code 



Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61c9471e

drivers/net/ethernet/nvidia/forcedeth.c

+6 −6
Original line number Diff line number Diff line
@@ -3930,7 +3930,7 @@ static int nv_request_irq(struct net_device *dev, int intr_test) 
{

	struct fe_priv *np = get_nvpriv(dev);

	u8 __iomem *base = get_hwbase(dev);

	int ret = 1;

	int ret;

	int i;

	irqreturn_t (*handler)(int foo, void *data);
@@ -4010,9 +4010,10 @@ static int nv_request_irq(struct net_device *dev, int intr_test) 
				writel(0, base + NvRegMSIXMap1);

			}

			netdev_info(dev, "MSI-X enabled\n");

			return 0;

		}

	}

	if (ret != 0 && np->msi_flags & NV_MSI_CAPABLE) {

	if (np->msi_flags & NV_MSI_CAPABLE) {

		ret = pci_enable_msi(np->pci_dev);

		if (ret == 0) {

			np->msi_flags |= NV_MSI_ENABLED;
@@ -4031,14 +4032,13 @@ static int nv_request_irq(struct net_device *dev, int intr_test) 
			/* enable msi vector 0 */

			writel(NVREG_MSI_VECTOR_0_ENABLED, base + NvRegMSIIrqMask);

			netdev_info(dev, "MSI enabled\n");

			return 0;

		}

	}

	if (ret != 0) {



	if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0)

		goto out_err;



	}



	return 0;

out_free_tx:

	free_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector, dev);