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

Commit 7a2eaf93 authored by Christian Dietrich's avatar Christian Dietrich Committed by Greg Kroah-Hartman
Browse files

staging: octeon: use printk_ratelimited instead of printk_ratelimit 



As per printk_ratelimit comment, it should not be used

Signed-off-by: default avatarChristian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9d17653c

drivers/staging/octeon/ethernet-mdio.c

+14 −13
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/kernel.h>

#include <linux/ethtool.h>

#include <linux/phy.h>

#include <linux/ratelimit.h>



#include <net/dst.h>
@@ -129,14 +130,14 @@ static void cvm_oct_adjust_link(struct net_device *dev) 
		if (priv->last_link) {

			netif_carrier_on(dev);

			if (priv->queue != -1)

				DEBUGPRINT("%s: %u Mbps %s duplex, "

				printk_ratelimited("%s: %u Mbps %s duplex, "

						   "port %2d, queue %2d\n",

						   dev->name, priv->phydev->speed,

						   priv->phydev->duplex ?

						   "Full" : "Half",

						   priv->port, priv->queue);

			else

				DEBUGPRINT("%s: %u Mbps %s duplex, "

				printk_ratelimited("%s: %u Mbps %s duplex, "

						   "port %2d, POW\n",

						   dev->name, priv->phydev->speed,

						   priv->phydev->duplex ?
@@ -144,7 +145,7 @@ static void cvm_oct_adjust_link(struct net_device *dev) 
						   priv->port);

		} else {

			netif_carrier_off(dev);

			DEBUGPRINT("%s: Link down\n", dev->name);

			printk_ratelimited("%s: Link down\n", dev->name);

		}

	}

}

drivers/staging/octeon/ethernet-rgmii.c

+17 −16
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/phy.h>

#include <linux/ratelimit.h>

#include <net/dst.h>



#include <asm/octeon/octeon.h>
@@ -116,7 +117,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
				cvmx_write_csr(CVMX_GMXX_RXX_INT_REG

					       (index, interface),

					       gmxx_rxx_int_reg.u64);

				DEBUGPRINT("%s: Using 10Mbps with software "

				printk_ratelimited("%s: Using 10Mbps with software "

						   "preamble removal\n",

						   dev->name);

			}
@@ -174,14 +175,14 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
			if (!netif_carrier_ok(dev))

				netif_carrier_on(dev);

			if (priv->queue != -1)

				DEBUGPRINT("%s: %u Mbps %s duplex, "

				printk_ratelimited("%s: %u Mbps %s duplex, "

						   "port %2d, queue %2d\n",

						   dev->name, link_info.s.speed,

						   (link_info.s.full_duplex) ?

						   "Full" : "Half",

						   priv->port, priv->queue);

			else

				DEBUGPRINT("%s: %u Mbps %s duplex, "

				printk_ratelimited("%s: %u Mbps %s duplex, "

						   "port %2d, POW\n",

						   dev->name, link_info.s.speed,

						   (link_info.s.full_duplex) ?
@@ -190,7 +191,7 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) 
		} else {

			if (netif_carrier_ok(dev))

				netif_carrier_off(dev);

			DEBUGPRINT("%s: Link down\n", dev->name);

			printk_ratelimited("%s: Link down\n", dev->name);

		}

	}

}

drivers/staging/octeon/ethernet-rx.c

+13 −11
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/ip.h>

#include <linux/string.h>

#include <linux/prefetch.h>

#include <linux/ratelimit.h>

#include <linux/smp.h>

#include <net/dst.h>

#ifdef CONFIG_XFRM
@@ -186,13 +187,13 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work) 


			if (*ptr == 0xd5) {

				/*

				   DEBUGPRINT("Port %d received 0xd5 preamble\n", work->ipprt);

				  printk_ratelimited("Port %d received 0xd5 preamble\n", work->ipprt);

				 */

				work->packet_ptr.s.addr += i + 1;

				work->len -= i + 5;

			} else if ((*ptr & 0xf) == 0xd) {

				/*

				   DEBUGPRINT("Port %d received 0x?d preamble\n", work->ipprt);

				  printk_ratelimited("Port %d received 0x?d preamble\n", work->ipprt);

				 */

				work->packet_ptr.s.addr += i;

				work->len -= i + 4;
@@ -203,7 +204,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work) 
					ptr++;

				}

			} else {

				DEBUGPRINT("Port %d unknown preamble, packet "

				printk_ratelimited("Port %d unknown preamble, packet "

						   "dropped\n",

						   work->ipprt);

				/*
@@ -214,7 +215,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work) 
			}

		}

	} else {

		DEBUGPRINT("Port %d receive error code %d, packet dropped\n",

		printk_ratelimited("Port %d receive error code %d, packet dropped\n",

				   work->ipprt, work->word2.snoip.err_code);

		cvm_oct_free_work(work);

		return 1;
@@ -334,7 +335,8 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) 
			 */

			skb = dev_alloc_skb(work->len);

			if (!skb) {

				DEBUGPRINT("Port %d failed to allocate skbuff, packet dropped\n",

				printk_ratelimited("Port %d failed to allocate "

						   "skbuff, packet dropped\n",

						   work->ipprt);

				cvm_oct_free_work(work);

				continue;
@@ -429,7 +431,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) 
			} else {

				/* Drop any packet received for a device that isn't up */

				/*

				DEBUGPRINT("%s: Device not up, packet dropped\n",

				  printk_ratelimited("%s: Device not up, packet dropped\n",

					   dev->name);

				*/

#ifdef CONFIG_64BIT
@@ -444,7 +446,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) 
			 * Drop any packet received for a device that

			 * doesn't exist.

			 */

			DEBUGPRINT("Port %d not controlled by Linux, packet dropped\n",

			printk_ratelimited("Port %d not controlled by Linux, packet dropped\n",

				   work->ipprt);

			dev_kfree_skb_irq(skb);

		}

drivers/staging/octeon/ethernet-sgmii.c

+8 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
**********************************************************************/

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/ratelimit.h>

#include <net/dst.h>



#include <asm/octeon/octeon.h>
@@ -90,20 +91,21 @@ static void cvm_oct_sgmii_poll(struct net_device *dev) 
		if (!netif_carrier_ok(dev))

			netif_carrier_on(dev);

		if (priv->queue != -1)

			DEBUGPRINT

			printk_ratelimited

			    ("%s: %u Mbps %s duplex, port %2d, queue %2d\n",

			     dev->name, link_info.s.speed,

			     (link_info.s.full_duplex) ? "Full" : "Half",

			     priv->port, priv->queue);

		else

			DEBUGPRINT("%s: %u Mbps %s duplex, port %2d, POW\n",

			printk_ratelimited

				("%s: %u Mbps %s duplex, port %2d, POW\n",

				 dev->name, link_info.s.speed,

				 (link_info.s.full_duplex) ? "Full" : "Half",

				 priv->port);

	} else {

		if (netif_carrier_ok(dev))

			netif_carrier_off(dev);

		DEBUGPRINT("%s: Link down\n", dev->name);

		printk_ratelimited("%s: Link down\n", dev->name);

	}

}

drivers/staging/octeon/ethernet-tx.c

+6 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/init.h>

#include <linux/etherdevice.h>

#include <linux/ip.h>

#include <linux/ratelimit.h>

#include <linux/string.h>

#include <net/dst.h>

#ifdef CONFIG_XFRM
@@ -446,7 +447,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) 
						 priv->queue + qos,

						 pko_command, hw_buffer,

						 CVMX_PKO_LOCK_NONE))) {

		DEBUGPRINT("%s: Failed to send the packet\n", dev->name);

		printk_ratelimited("%s: Failed to send the packet\n", dev->name);

		queue_type = QUEUE_DROP;

	}

skip_xmit:
@@ -525,8 +526,8 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) 
	/* Get a work queue entry */

	cvmx_wqe_t *work = cvmx_fpa_alloc(CVMX_FPA_WQE_POOL);

	if (unlikely(work == NULL)) {

		DEBUGPRINT("%s: Failed to allocate a work queue entry\n",

			   dev->name);

		printk_ratelimited("%s: Failed to allocate a work "

				   "queue entry\n", dev->name);

		priv->stats.tx_dropped++;

		dev_kfree_skb(skb);

		return 0;
@@ -535,7 +536,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) 
	/* Get a packet buffer */

	packet_buffer = cvmx_fpa_alloc(CVMX_FPA_PACKET_POOL);

	if (unlikely(packet_buffer == NULL)) {

		DEBUGPRINT("%s: Failed to allocate a packet buffer\n",

		printk_ratelimited("%s: Failed to allocate a packet buffer\n",

				   dev->name);

		cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, DONT_WRITEBACK(1));

		priv->stats.tx_dropped++;