diff options
author | Colin Ian King <colin.king@canonical.com> | 2016-10-04 08:57:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-06 20:44:12 -0400 |
commit | 451e856ef70907caec288d56c71b9409f29311d6 (patch) | |
tree | bd69c3d5281d31bae2aac0c0627cb7989b423e69 /drivers/net | |
parent | 87089dd76815b153892ed4c9f4006d66c087ae28 (diff) |
net: hns: Add missing \n to end of dev_err messages, tidy up text
Trival fix, dev_err messages are missing a \n, so add it. Also
fix grammer, spelling mistake and add white spaces to various
error messages.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c index a834774fdb02..751c1264c811 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | |||
@@ -126,7 +126,7 @@ void hns_mac_adjust_link(struct hns_mac_cb *mac_cb, int speed, int duplex) | |||
126 | (enum mac_speed)speed, duplex); | 126 | (enum mac_speed)speed, duplex); |
127 | if (ret) { | 127 | if (ret) { |
128 | dev_err(mac_cb->dev, | 128 | dev_err(mac_cb->dev, |
129 | "adjust_link failed,%s mac%d ret = %#x!\n", | 129 | "adjust_link failed, %s mac%d ret = %#x!\n", |
130 | mac_cb->dsaf_dev->ae_dev.name, | 130 | mac_cb->dsaf_dev->ae_dev.name, |
131 | mac_cb->mac_id, ret); | 131 | mac_cb->mac_id, ret); |
132 | return; | 132 | return; |
@@ -149,7 +149,7 @@ static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb, | |||
149 | if (mac_cb->dsaf_dev->dsaf_mode <= DSAF_MODE_ENABLE) { | 149 | if (mac_cb->dsaf_dev->dsaf_mode <= DSAF_MODE_ENABLE) { |
150 | if (mac_cb->mac_id != DSAF_MAX_PORT_NUM) { | 150 | if (mac_cb->mac_id != DSAF_MAX_PORT_NUM) { |
151 | dev_err(mac_cb->dev, | 151 | dev_err(mac_cb->dev, |
152 | "input invalid,%s mac%d vmid%d !\n", | 152 | "input invalid, %s mac%d vmid%d !\n", |
153 | mac_cb->dsaf_dev->ae_dev.name, | 153 | mac_cb->dsaf_dev->ae_dev.name, |
154 | mac_cb->mac_id, vmid); | 154 | mac_cb->mac_id, vmid); |
155 | return -EINVAL; | 155 | return -EINVAL; |
@@ -157,19 +157,19 @@ static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb, | |||
157 | } else if (mac_cb->dsaf_dev->dsaf_mode < DSAF_MODE_MAX) { | 157 | } else if (mac_cb->dsaf_dev->dsaf_mode < DSAF_MODE_MAX) { |
158 | if (mac_cb->mac_id >= DSAF_MAX_PORT_NUM) { | 158 | if (mac_cb->mac_id >= DSAF_MAX_PORT_NUM) { |
159 | dev_err(mac_cb->dev, | 159 | dev_err(mac_cb->dev, |
160 | "input invalid,%s mac%d vmid%d!\n", | 160 | "input invalid, %s mac%d vmid%d!\n", |
161 | mac_cb->dsaf_dev->ae_dev.name, | 161 | mac_cb->dsaf_dev->ae_dev.name, |
162 | mac_cb->mac_id, vmid); | 162 | mac_cb->mac_id, vmid); |
163 | return -EINVAL; | 163 | return -EINVAL; |
164 | } | 164 | } |
165 | } else { | 165 | } else { |
166 | dev_err(mac_cb->dev, "dsaf mode invalid,%s mac%d!\n", | 166 | dev_err(mac_cb->dev, "dsaf mode invalid, %s mac%d!\n", |
167 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id); | 167 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id); |
168 | return -EINVAL; | 168 | return -EINVAL; |
169 | } | 169 | } |
170 | 170 | ||
171 | if (vmid >= mac_cb->dsaf_dev->rcb_common[0]->max_vfn) { | 171 | if (vmid >= mac_cb->dsaf_dev->rcb_common[0]->max_vfn) { |
172 | dev_err(mac_cb->dev, "input invalid,%s mac%d vmid%d !\n", | 172 | dev_err(mac_cb->dev, "input invalid, %s mac%d vmid%d !\n", |
173 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id, vmid); | 173 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id, vmid); |
174 | return -EINVAL; | 174 | return -EINVAL; |
175 | } | 175 | } |
@@ -196,7 +196,7 @@ static int hns_mac_get_inner_port_num(struct hns_mac_cb *mac_cb, | |||
196 | tmp_port = vmid; | 196 | tmp_port = vmid; |
197 | break; | 197 | break; |
198 | default: | 198 | default: |
199 | dev_err(mac_cb->dev, "dsaf mode invalid,%s mac%d!\n", | 199 | dev_err(mac_cb->dev, "dsaf mode invalid, %s mac%d!\n", |
200 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id); | 200 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id); |
201 | return -EINVAL; | 201 | return -EINVAL; |
202 | } | 202 | } |
@@ -275,7 +275,7 @@ int hns_mac_set_multi(struct hns_mac_cb *mac_cb, | |||
275 | ret = hns_dsaf_add_mac_mc_port(dsaf_dev, &mac_entry); | 275 | ret = hns_dsaf_add_mac_mc_port(dsaf_dev, &mac_entry); |
276 | if (ret) { | 276 | if (ret) { |
277 | dev_err(dsaf_dev->dev, | 277 | dev_err(dsaf_dev->dev, |
278 | "set mac mc port failed,%s mac%d ret = %#x!\n", | 278 | "set mac mc port failed, %s mac%d ret = %#x!\n", |
279 | mac_cb->dsaf_dev->ae_dev.name, | 279 | mac_cb->dsaf_dev->ae_dev.name, |
280 | mac_cb->mac_id, ret); | 280 | mac_cb->mac_id, ret); |
281 | return ret; | 281 | return ret; |
@@ -305,7 +305,7 @@ int hns_mac_del_mac(struct hns_mac_cb *mac_cb, u32 vfn, char *mac) | |||
305 | old_mac = &mac_cb->addr_entry_idx[vfn]; | 305 | old_mac = &mac_cb->addr_entry_idx[vfn]; |
306 | } else { | 306 | } else { |
307 | dev_err(mac_cb->dev, | 307 | dev_err(mac_cb->dev, |
308 | "vf queue is too large,%s mac%d queue = %#x!\n", | 308 | "vf queue is too large, %s mac%d queue = %#x!\n", |
309 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id, vfn); | 309 | mac_cb->dsaf_dev->ae_dev.name, mac_cb->mac_id, vfn); |
310 | return -EINVAL; | 310 | return -EINVAL; |
311 | } | 311 | } |
@@ -547,7 +547,7 @@ int hns_mac_set_autoneg(struct hns_mac_cb *mac_cb, u8 enable) | |||
547 | struct mac_driver *mac_ctrl_drv = hns_mac_get_drv(mac_cb); | 547 | struct mac_driver *mac_ctrl_drv = hns_mac_get_drv(mac_cb); |
548 | 548 | ||
549 | if (mac_cb->phy_if == PHY_INTERFACE_MODE_XGMII && enable) { | 549 | if (mac_cb->phy_if == PHY_INTERFACE_MODE_XGMII && enable) { |
550 | dev_err(mac_cb->dev, "enable autoneg is not allowed!"); | 550 | dev_err(mac_cb->dev, "enabling autoneg is not allowed!\n"); |
551 | return -ENOTSUPP; | 551 | return -ENOTSUPP; |
552 | } | 552 | } |
553 | 553 | ||
@@ -571,7 +571,7 @@ int hns_mac_set_pauseparam(struct hns_mac_cb *mac_cb, u32 rx_en, u32 tx_en) | |||
571 | 571 | ||
572 | if (mac_cb->mac_type == HNAE_PORT_DEBUG) { | 572 | if (mac_cb->mac_type == HNAE_PORT_DEBUG) { |
573 | if (is_ver1 && (tx_en || rx_en)) { | 573 | if (is_ver1 && (tx_en || rx_en)) { |
574 | dev_err(mac_cb->dev, "macv1 cann't enable tx/rx_pause!"); | 574 | dev_err(mac_cb->dev, "macv1 can't enable tx/rx_pause!\n"); |
575 | return -EINVAL; | 575 | return -EINVAL; |
576 | } | 576 | } |
577 | } | 577 | } |
@@ -941,7 +941,7 @@ int hns_mac_get_cfg(struct dsaf_device *dsaf_dev, struct hns_mac_cb *mac_cb) | |||
941 | ret = hns_mac_get_mode(mac_cb->phy_if); | 941 | ret = hns_mac_get_mode(mac_cb->phy_if); |
942 | if (ret < 0) { | 942 | if (ret < 0) { |
943 | dev_err(dsaf_dev->dev, | 943 | dev_err(dsaf_dev->dev, |
944 | "hns_mac_get_mode failed,mac%d ret = %#x!\n", | 944 | "hns_mac_get_mode failed, mac%d ret = %#x!\n", |
945 | mac_cb->mac_id, ret); | 945 | mac_cb->mac_id, ret); |
946 | return ret; | 946 | return ret; |
947 | } | 947 | } |