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

Commit a2d4fcb8 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "Revert "smc91x: retrieve IRQ and trigger flags in a modern way"" 



This reverts commit 8d7d9cca.

Now that the necessary infrastructure is really all there
in the tree, we can put this change back in.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 965b2aa7

drivers/net/ethernet/smsc/smc91x.c

+12 −8
Original line number Diff line number Diff line
@@ -2238,9 +2238,10 @@ static int smc_drv_probe(struct platform_device *pdev) 
	const struct of_device_id *match = NULL;

	struct smc_local *lp;

	struct net_device *ndev;

	struct resource *res, *ires;

	struct resource *res;

	unsigned int __iomem *addr;

	unsigned long irq_flags = SMC_IRQ_FLAGS;

	unsigned long irq_resflags;

	int ret;



	ndev = alloc_etherdev(sizeof(struct smc_local));
@@ -2332,16 +2333,19 @@ static int smc_drv_probe(struct platform_device *pdev) 
		goto out_free_netdev;

	}



	ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!ires) {

	ndev->irq = platform_get_irq(pdev, 0);

	if (ndev->irq <= 0) {

		ret = -ENODEV;

		goto out_release_io;

	}



	ndev->irq = ires->start;



	if (irq_flags == -1 || ires->flags & IRQF_TRIGGER_MASK)

		irq_flags = ires->flags & IRQF_TRIGGER_MASK;

	/*

	 * If this platform does not specify any special irqflags, or if

	 * the resource supplies a trigger, override the irqflags with

	 * the trigger flags from the resource.

	 */

	irq_resflags = irqd_get_trigger_type(irq_get_irq_data(ndev->irq));

	if (irq_flags == -1 || irq_resflags & IRQF_TRIGGER_MASK)

		irq_flags = irq_resflags & IRQF_TRIGGER_MASK;



	ret = smc_request_attrib(pdev, ndev);

	if (ret)