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

Commit cf68ca1e authored by Michael Opdenacker's avatar Michael Opdenacker Committed by David S. Miller
Browse files

net: smsc: remove deprecated IRQF_DISABLED 



This patch proposes to remove the IRQF_DISABLED flag from
code in drivers/net/ethernet/smsc/

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78874271

drivers/net/ethernet/smsc/smc91x.h

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static inline void mcf_outsw(void *a, unsigned char *p, int l) 
#define SMC_insw(a, r, p, l)	mcf_insw(a + r, p, l)

#define SMC_outsw(a, r, p, l)	mcf_outsw(a + r, p, l)



#define SMC_IRQ_FLAGS		(IRQF_DISABLED)

#define SMC_IRQ_FLAGS		0



#else

drivers/net/ethernet/smsc/smsc9420.c

+1 −2
Original line number Diff line number Diff line
@@ -1356,8 +1356,7 @@ static int smsc9420_open(struct net_device *dev) 
	smsc9420_reg_write(pd, INT_STAT, 0xFFFFFFFF);

	smsc9420_pci_flush_write(pd);



	result = request_irq(irq, smsc9420_isr, IRQF_SHARED | IRQF_DISABLED,

			     DRV_NAME, pd);

	result = request_irq(irq, smsc9420_isr, IRQF_SHARED, DRV_NAME, pd);

	if (result) {

		smsc_warn(IFUP, "Unable to use IRQ = %d", irq);

		result = -ENODEV;