tulip/xircom_cb.c: Use dev_<level> and pr_<level> (44298ec0) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/tulip/xircom_cb.c

+25 −19

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,8 @@
	* $Id: xircom_cb.c,v 1.33 2001/03/19 14:02:07 arjanv Exp $		* $Id: xircom_cb.c,v 1.33 2001/03/19 14:02:07 arjanv Exp $
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/string.h>		#include <linux/string.h>
	@@ -234,7 +236,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
	pci_write_config_word (pdev, PCI_STATUS,tmp16);		pci_write_config_word (pdev, PCI_STATUS,tmp16);

	if (!request_region(pci_resource_start(pdev, 0), 128, "xircom_cb")) {		if (!request_region(pci_resource_start(pdev, 0), 128, "xircom_cb")) {
	printk(KERN_ERR "xircom_probe: failed to allocate io-region\n");		pr_err("%s: failed to allocate io-region\n", __func__);
	return -ENODEV;		return -ENODEV;
	}		}

	@@ -245,7 +247,7 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
	*/		*/
	dev = alloc_etherdev(sizeof(struct xircom_private));		dev = alloc_etherdev(sizeof(struct xircom_private));
	if (!dev) {		if (!dev) {
	printk(KERN_ERR "xircom_probe: failed to allocate etherdev\n");		pr_err("%s: failed to allocate etherdev\n", __func__);
	goto device_fail;		goto device_fail;
	}		}
	private = netdev_priv(dev);		private = netdev_priv(dev);
	@@ -253,12 +255,12 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
	/* Allocate the send/receive buffers */		/* Allocate the send/receive buffers */
	private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);		private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);
	if (private->rx_buffer == NULL) {		if (private->rx_buffer == NULL) {
	printk(KERN_ERR "xircom_probe: no memory for rx buffer \n");		pr_err("%s: no memory for rx buffer\n", __func__);
	goto rx_buf_fail;		goto rx_buf_fail;
	}		}
	private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);		private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);
	if (private->tx_buffer == NULL) {		if (private->tx_buffer == NULL) {
	printk(KERN_ERR "xircom_probe: no memory for tx buffer \n");		pr_err("%s: no memory for tx buffer\n", __func__);
	goto tx_buf_fail;		goto tx_buf_fail;
	}		}

	@@ -281,11 +283,12 @@ static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_
	pci_set_drvdata(pdev, dev);		pci_set_drvdata(pdev, dev);

	if (register_netdev(dev)) {		if (register_netdev(dev)) {
	printk(KERN_ERR "xircom_probe: netdevice registration failed.\n");		pr_err("%s: netdevice registration failed\n", __func__);
	goto reg_fail;		goto reg_fail;
	}		}

	printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n", dev->name, pdev->revision, pdev->irq);		dev_info(&dev->dev, "Xircom cardbus revision %i at irq %i\n",
			pdev->revision, pdev->irq);
	/* start the transmitter to get a heartbeat */		/* start the transmitter to get a heartbeat */
	/* TODO: send 2 dummy packets here */		/* TODO: send 2 dummy packets here */
	transceiver_voodoo(private);		transceiver_voodoo(private);
	@@ -347,8 +350,10 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)

	#ifdef DEBUG		#ifdef DEBUG
	print_binary(status);		print_binary(status);
	printk("tx status 0x%08x 0x%08x \n",card->tx_buffer[0],card->tx_buffer[4]);		printk("tx status 0x%08x 0x%08x \n",
	printk("rx status 0x%08x 0x%08x \n",card->rx_buffer[0],card->rx_buffer[4]);		card->tx_buffer[0], card->tx_buffer[4]);
			printk("rx status 0x%08x 0x%08x \n",
			card->rx_buffer[0], card->rx_buffer[4]);
	#endif		#endif
	/* Handle shared irq and hotplug */		/* Handle shared irq and hotplug */
	if (status == 0 \|\| status == 0xffffffff) {		if (status == 0 \|\| status == 0xffffffff) {
	@@ -360,7 +365,7 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
	int newlink;		int newlink;
	printk(KERN_DEBUG "xircom_cb: Link status has changed\n");		printk(KERN_DEBUG "xircom_cb: Link status has changed\n");
	newlink = link_status(card);		newlink = link_status(card);
	printk(KERN_INFO "xircom_cb: Link is %i mbit \n",newlink);		dev_info(&dev->dev, "Link is %i mbit\n", newlink);
	if (newlink)		if (newlink)
	netif_carrier_on(dev);		netif_carrier_on(dev);
	else		else
	@@ -457,7 +462,8 @@ static int xircom_open(struct net_device *dev)
	struct xircom_private *xp = netdev_priv(dev);		struct xircom_private *xp = netdev_priv(dev);
	int retval;		int retval;
	enter("xircom_open");		enter("xircom_open");
	printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq);		pr_info("xircom cardbus adaptor found, registering as %s, using irq %i \n",
			dev->name, dev->irq);
	retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);		retval = request_irq(dev->irq, xircom_interrupt, IRQF_SHARED, dev->name, dev);
	if (retval) {		if (retval) {
	leave("xircom_open - No IRQ");		leave("xircom_open - No IRQ");
	@@ -770,7 +776,7 @@ static void activate_receiver(struct xircom_private *card)
	udelay(50);		udelay(50);
	counter--;		counter--;
	if (counter <= 0)		if (counter <= 0)
	printk(KERN_ERR "xircom_cb: Receiver failed to deactivate\n");		pr_err("Receiver failed to deactivate\n");
	}		}

	/* enable the receiver */		/* enable the receiver */
	@@ -787,7 +793,7 @@ static void activate_receiver(struct xircom_private *card)
	udelay(50);		udelay(50);
	counter--;		counter--;
	if (counter <= 0)		if (counter <= 0)
	printk(KERN_ERR "xircom_cb: Receiver failed to re-activate\n");		pr_err("Receiver failed to re-activate\n");
	}		}

	leave("activate_receiver");		leave("activate_receiver");
	@@ -818,7 +824,7 @@ static void deactivate_receiver(struct xircom_private *card)
	udelay(50);		udelay(50);
	counter--;		counter--;
	if (counter <= 0)		if (counter <= 0)
	printk(KERN_ERR "xircom_cb: Receiver failed to deactivate\n");		pr_err("Receiver failed to deactivate\n");
	}		}


	@@ -861,7 +867,7 @@ static void activate_transmitter(struct xircom_private *card)
	udelay(50);		udelay(50);
	counter--;		counter--;
	if (counter <= 0)		if (counter <= 0)
	printk(KERN_ERR "xircom_cb: Transmitter failed to deactivate\n");		pr_err("Transmitter failed to deactivate\n");
	}		}

	/* enable the transmitter */		/* enable the transmitter */
	@@ -878,7 +884,7 @@ static void activate_transmitter(struct xircom_private *card)
	udelay(50);		udelay(50);
	counter--;		counter--;
	if (counter <= 0)		if (counter <= 0)
	printk(KERN_ERR "xircom_cb: Transmitter failed to re-activate\n");		pr_err("Transmitter failed to re-activate\n");
	}		}

	leave("activate_transmitter");		leave("activate_transmitter");
	@@ -909,7 +915,7 @@ static void deactivate_transmitter(struct xircom_private *card)
	udelay(50);		udelay(50);
	counter--;		counter--;
	if (counter <= 0)		if (counter <= 0)
	printk(KERN_ERR "xircom_cb: Transmitter failed to deactivate\n");		pr_err("Transmitter failed to deactivate\n");
	}		}


	@@ -1184,7 +1190,7 @@ static void investigate_read_descriptor(struct net_device *dev,struct xircom_pri
	struct sk_buff *skb;		struct sk_buff *skb;

	if (pkt_len > 1518) {		if (pkt_len > 1518) {
	printk(KERN_ERR "xircom_cb: Packet length %i is bogus \n",pkt_len);		pr_err("Packet length %i is bogus\n", pkt_len);
	pkt_len = 1518;		pkt_len = 1518;
	}		}

	@@ -1222,7 +1228,7 @@ static void investigate_write_descriptor(struct net_device *dev, struct xircom_p
	status = le32_to_cpu(card->tx_buffer[4*descnr]);		status = le32_to_cpu(card->tx_buffer[4*descnr]);
	#if 0		#if 0
	if (status & 0x8000) { /* Major error */		if (status & 0x8000) { /* Major error */
	printk(KERN_ERR "Major transmit error status %x \n", status);		pr_err("Major transmit error status %x\n", status);
	card->tx_buffer[4*descnr] = 0;		card->tx_buffer[4*descnr] = 0;
	netif_wake_queue (dev);		netif_wake_queue (dev);
	}		}