소스 검색

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 <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gulsah Kose 11 년 전
부모
커밋
42e0e19d5d
1개의 변경된 파일3개의 추가작업 그리고 6개의 파일을 삭제
  1. 3 6
      drivers/staging/octeon/ethernet-rgmii.c

+ 3 - 6
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
 				cvmx_write_csr(CVMX_GMXX_RXX_INT_REG
 					       (index, interface),
 					       (index, interface),
 					       gmxx_rxx_int_reg.u64);
 					       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);
 						   dev->name);
 			}
 			}
 		}
 		}
@@ -178,15 +177,13 @@ static void cvm_oct_rgmii_poll(struct net_device *dev)
 			if (!netif_carrier_ok(dev))
 			if (!netif_carrier_ok(dev))
 				netif_carrier_on(dev);
 				netif_carrier_on(dev);
 			if (priv->queue != -1)
 			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,
 						   dev->name, link_info.s.speed,
 						   (link_info.s.full_duplex) ?
 						   (link_info.s.full_duplex) ?
 						   "Full" : "Half",
 						   "Full" : "Half",
 						   priv->port, priv->queue);
 						   priv->port, priv->queue);
 			else
 			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,
 						   dev->name, link_info.s.speed,
 						   (link_info.s.full_duplex) ?
 						   (link_info.s.full_duplex) ?
 						   "Full" : "Half",
 						   "Full" : "Half",