From 42e0e19d5d5877ea6507aafcd8ff59c1fe6e2f59 Mon Sep 17 00:00:00 2001 From: Gulsah Kose Date: Tue, 30 Sep 2014 22:12:22 +0300 Subject: [PATCH] staging: octeon: Combined seperate strings. This patch fixes "quoted string split across lines" checkpatch.pl warning in ethernet-rgmii.c Signed-off-by: Gulsah Kose Signed-off-by: Greg Kroah-Hartman --- drivers/staging/octeon/ethernet-rgmii.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/octeon/ethernet-rgmii.c b/drivers/staging/octeon/ethernet-rgmii.c index 7eea5f03ddfc..e36f9bc69543 100644 --- a/drivers/staging/octeon/ethernet-rgmii.c +++ b/drivers/staging/octeon/ethernet-rgmii.c @@ -121,8 +121,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); - printk_ratelimited("%s: Using 10Mbps with software " - "preamble removal\n", + printk_ratelimited("%s: Using 10Mbps with software preamble removal\n", dev->name); } } @@ -178,15 +177,13 @@ static void cvm_oct_rgmii_poll(struct net_device *dev) if (!netif_carrier_ok(dev)) netif_carrier_on(dev); if (priv->queue != -1) - printk_ratelimited("%s: %u Mbps %s duplex, " - "port %2d, queue %2d\n", + 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 - printk_ratelimited("%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", -- 2.11.0