evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: octeon: Combined seperate strings.

Browse source 
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>
This commit is contained in:
Gulsah Kose 2014-09-30 22:12:22 +03:00 • committed by Greg Kroah-Hartman
parent 56e1ccac5f
commit 42e0e19d5d
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/octeon/ethernet-rgmii.c
View file

@ -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 " printk_ratelimited("%s: Using 10Mbps with software preamble removal\n",
"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, " printk_ratelimited("%s: %u Mbps %s duplex, port %2d, queue %2d\n",
"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, " printk_ratelimited("%s: %u Mbps %s duplex, port %2d, POW\n",
"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",