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

Commit ec6d2d45 authored by Florian Fainelli's avatar Florian Fainelli Committed by Francois Romieu
Browse files

r6040: cleanups 



- use netdev_alloc_skb
- remove an useless variable in the IRQ handler
- remove an unused private structure member
- fix a spelling mistake

Signed-off-by: default avatarFlorian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent 106adf3c

drivers/net/r6040.c

+3 −5
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ struct r6040_private { 
	struct net_device *dev;

	struct mii_if_info mii_if;

	struct napi_struct napi;

	u16	napi_rx_running;

	void __iomem *base;

};
@@ -290,7 +289,7 @@ static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev) 


	descptr = lp->rx_insert_ptr;

	while (lp->rx_free_desc < RX_DCNT) {

		descptr->skb_ptr = dev_alloc_skb(MAX_BUF_SIZE);

		descptr->skb_ptr = netdev_alloc_skb(dev, MAX_BUF_SIZE);



		if (!descptr->skb_ptr)

			break;
@@ -584,7 +583,7 @@ static void r6040_tx(struct net_device *dev) 
			dev->stats.tx_carrier_errors++;



		if (descptr->status & 0x8000)

			break; /* Not complte */

			break; /* Not complete */

		skb_ptr = descptr->skb_ptr;

		pci_unmap_single(priv->pdev, descptr->buf,

			skb_ptr->len, PCI_DMA_TODEVICE);
@@ -627,7 +626,6 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) 
	struct r6040_private *lp = netdev_priv(dev);

	void __iomem *ioaddr = lp->base;

	u16 status;

	int handled = 1;



	/* Mask off RDC MAC interrupt */

	iowrite16(MSK_INT, ioaddr + MIER);
@@ -647,7 +645,7 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) 
	if (status & 0x10)

		r6040_tx(dev);



	return IRQ_RETVAL(handled);

	return IRQ_HANDLED;

}



#ifdef CONFIG_NET_POLL_CONTROLLER