Commit a7992290 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Replace MACvIntDisable with VNSvOutPortD 



Replace macro MACvIntDisable with VNSvOutPortD and as it
was only used twice, it can now be removed.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/937422bb879d8f1f58978bedc8d15559d28581c7.1653203927.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 159ed047

drivers/staging/vt6655/device_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) 


	schedule_work(&priv->interrupt_work);



	MACvIntDisable(priv->port_offset);

	VNSvOutPortD(priv->port_offset + MAC_REG_IMR, 0);



	return IRQ_HANDLED;

}

drivers/staging/vt6655/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ bool MACbShutdown(struct vnt_private *priv) 
{

	void __iomem *io_base = priv->port_offset;

	/* disable MAC IMR */

	MACvIntDisable(io_base);

	VNSvOutPortD(io_base + MAC_REG_IMR, 0);

	MACvSetLoopbackMode(priv, MAC_LB_INTERNAL);

	/* stop the adapter */

	if (!MACbSafeStop(priv)) {

drivers/staging/vt6655/mac.h

+0 −3
Original line number Diff line number Diff line
@@ -648,9 +648,6 @@ do { \ 
	iowrite8(byOrgValue, iobase + MAC_REG_STICKHW);			\

} while (0)



#define MACvIntDisable(iobase)				\

	VNSvOutPortD(iobase + MAC_REG_IMR, 0)



#define MACvSelectPage0(iobase)				\

	iowrite8(0, iobase + MAC_REG_PAGE1SEL)