Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: marvell: prestera: fix patchwork build problems

fix the remaining build issues reported by patchwork
in firmware v4.0 support commit which has been already
merged.

Fix patchwork issues:
- source inline
- checkpatch

Fixes: bb5dbf2cc64d ("net: marvell: prestera: add firmware v4.0 support")
Signed-off-by: Volodymyr Mytnyk <vmytnyk@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Volodymyr Mytnyk and committed by
David S. Miller
a46a5036 dce981c4

+10 -5
+2 -1
drivers/net/ethernet/marvell/prestera/prestera_ethtool.c
··· 499 499 { 500 500 struct prestera_port_phy_state *state = &port->state_phy; 501 501 502 - if (prestera_hw_port_phy_mode_get(port, &state->mdix, NULL, NULL, NULL)) { 502 + if (prestera_hw_port_phy_mode_get(port, 503 + &state->mdix, NULL, NULL, NULL)) { 503 504 netdev_warn(port->dev, "MDIX params get failed"); 504 505 state->mdix = ETH_TP_MDI_INVALID; 505 506 }
+2 -1
drivers/net/ethernet/marvell/prestera/prestera_hw.c
··· 1356 1356 int prestera_hw_port_autoneg_restart(struct prestera_port *port) 1357 1357 { 1358 1358 struct prestera_msg_port_attr_req req = { 1359 - .attr = __cpu_to_le32(PRESTERA_CMD_PORT_ATTR_PHY_AUTONEG_RESTART), 1359 + .attr = 1360 + __cpu_to_le32(PRESTERA_CMD_PORT_ATTR_PHY_AUTONEG_RESTART), 1360 1361 .port = __cpu_to_le32(port->hw_id), 1361 1362 .dev = __cpu_to_le32(port->dev_id), 1362 1363 };
+4 -2
drivers/net/ethernet/marvell/prestera/prestera_main.c
··· 405 405 406 406 err = prestera_port_cfg_mac_write(port, &cfg_mac); 407 407 if (err) { 408 - dev_err(prestera_dev(sw), "Failed to set port(%u) mac mode\n", id); 408 + dev_err(prestera_dev(sw), 409 + "Failed to set port(%u) mac mode\n", id); 409 410 goto err_port_init; 410 411 } 411 412 ··· 419 418 false, 0, 0, 420 419 port->cfg_phy.mdix); 421 420 if (err) { 422 - dev_err(prestera_dev(sw), "Failed to set port(%u) phy mode\n", id); 421 + dev_err(prestera_dev(sw), 422 + "Failed to set port(%u) phy mode\n", id); 423 423 goto err_port_init; 424 424 } 425 425 }
+2 -1
drivers/net/ethernet/marvell/prestera/prestera_pci.c
··· 411 411 goto cmd_exit; 412 412 } 413 413 414 - memcpy_fromio(out_msg, prestera_fw_cmdq_buf(fw, qid) + in_size, ret_size); 414 + memcpy_fromio(out_msg, 415 + prestera_fw_cmdq_buf(fw, qid) + in_size, ret_size); 415 416 416 417 cmd_exit: 417 418 prestera_fw_write(fw, PRESTERA_CMDQ_REQ_CTL_REG(qid),