Commit 1b998958 authored by Scott Schafer's avatar Scott Schafer Committed by Greg Kroah-Hartman

staging: qlge: Fix CHECK: Alignment should match open parenthesis

Fix CHECK: Alignment should match open parenthesis in qlge_dbg.c,
qlge_ethtool.c, qlge_main.c, and qlge_mpi.c. Also made changes to
the following lines:

WARNING: quoted string split across lines
FILE: drivers/staging/qlge/qlge_main.c:81

WARNING: quoted string split across lines
FILE: drivers/staging/qlge/qlge_main.c:87

WARNING: quoted string split across lines
FILE: drivers/staging/qlge/qlge_main.c:3528

WARNING: quoted string split across lines
FILE: drivers/staging/qlge/qlge_main.c:3536

CHECK: spaces preferred around that '*' (ctx:VxV)
drivers/staging/qlge/qlge_main.c:4102

I made these changes due to touching these lines in the original fix
Signed-off-by: default avatarScott Schafer <schaferjscott@gmail.com>
Link: https://lore.kernel.org/r/27ec7ee0a3ba8c1ad946077aacfcc6e40b98c106.1576086080.git.schaferjscott@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25dde243
...@@ -144,7 +144,8 @@ static int ql_get_serdes_regs(struct ql_adapter *qdev, ...@@ -144,7 +144,8 @@ static int ql_get_serdes_regs(struct ql_adapter *qdev,
/* The XAUI needs to be read out per port */ /* The XAUI needs to be read out per port */
status = ql_read_other_func_serdes_reg(qdev, status = ql_read_other_func_serdes_reg(qdev,
XG_SERDES_XAUI_HSS_PCS_START, &temp); XG_SERDES_XAUI_HSS_PCS_START,
&temp);
if (status) if (status)
temp = XG_SERDES_ADDR_XAUI_PWR_DOWN; temp = XG_SERDES_ADDR_XAUI_PWR_DOWN;
...@@ -480,7 +481,8 @@ static int ql_get_mpi_shadow_regs(struct ql_adapter *qdev, u32 *buf) ...@@ -480,7 +481,8 @@ static int ql_get_mpi_shadow_regs(struct ql_adapter *qdev, u32 *buf)
int status; int status;
for (i = 0; i < MPI_CORE_SH_REGS_CNT; i++, buf++) { for (i = 0; i < MPI_CORE_SH_REGS_CNT; i++, buf++) {
status = ql_write_mpi_reg(qdev, RISC_124, status = ql_write_mpi_reg(qdev,
RISC_124,
(SHADOW_OFFSET | i << SHADOW_REG_SHIFT)); (SHADOW_OFFSET | i << SHADOW_REG_SHIFT));
if (status) if (status)
goto end; goto end;
...@@ -1106,7 +1108,7 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump) ...@@ -1106,7 +1108,7 @@ int ql_core_dump(struct ql_adapter *qdev, struct ql_mpi_coredump *mpi_coredump)
+ sizeof(mpi_coredump->nic_routing_words), + sizeof(mpi_coredump->nic_routing_words),
"Routing Words"); "Routing Words");
status = ql_get_routing_entries(qdev, status = ql_get_routing_entries(qdev,
&mpi_coredump->nic_routing_words[0]); &mpi_coredump->nic_routing_words[0]);
if (status) if (status)
goto err; goto err;
......
...@@ -196,8 +196,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev) ...@@ -196,8 +196,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
*/ */
cqicb = (struct cqicb *)&qdev->rx_ring[qdev->rss_ring_count]; cqicb = (struct cqicb *)&qdev->rx_ring[qdev->rss_ring_count];
if (le16_to_cpu(cqicb->irq_delay) != qdev->tx_coalesce_usecs || if (le16_to_cpu(cqicb->irq_delay) != qdev->tx_coalesce_usecs ||
le16_to_cpu(cqicb->pkt_delay) != le16_to_cpu(cqicb->pkt_delay) != qdev->tx_max_coalesced_frames) {
qdev->tx_max_coalesced_frames) {
for (i = qdev->rss_ring_count; i < qdev->rx_ring_count; i++) { for (i = qdev->rss_ring_count; i < qdev->rx_ring_count; i++) {
rx_ring = &qdev->rx_ring[i]; rx_ring = &qdev->rx_ring[i];
cqicb = (struct cqicb *)rx_ring; cqicb = (struct cqicb *)rx_ring;
...@@ -206,7 +205,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev) ...@@ -206,7 +205,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
cpu_to_le16(qdev->tx_max_coalesced_frames); cpu_to_le16(qdev->tx_max_coalesced_frames);
cqicb->flags = FLAGS_LI; cqicb->flags = FLAGS_LI;
status = ql_write_cfg(qdev, cqicb, sizeof(*cqicb), status = ql_write_cfg(qdev, cqicb, sizeof(*cqicb),
CFG_LCQ, rx_ring->cq_id); CFG_LCQ, rx_ring->cq_id);
if (status) { if (status) {
netif_err(qdev, ifup, qdev->ndev, netif_err(qdev, ifup, qdev->ndev,
"Failed to load CQICB.\n"); "Failed to load CQICB.\n");
...@@ -218,8 +217,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev) ...@@ -218,8 +217,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
/* Update the inbound (RSS) handler queues if they changed. */ /* Update the inbound (RSS) handler queues if they changed. */
cqicb = (struct cqicb *)&qdev->rx_ring[0]; cqicb = (struct cqicb *)&qdev->rx_ring[0];
if (le16_to_cpu(cqicb->irq_delay) != qdev->rx_coalesce_usecs || if (le16_to_cpu(cqicb->irq_delay) != qdev->rx_coalesce_usecs ||
le16_to_cpu(cqicb->pkt_delay) != le16_to_cpu(cqicb->pkt_delay) != qdev->rx_max_coalesced_frames) {
qdev->rx_max_coalesced_frames) {
for (i = 0; i < qdev->rss_ring_count; i++, rx_ring++) { for (i = 0; i < qdev->rss_ring_count; i++, rx_ring++) {
rx_ring = &qdev->rx_ring[i]; rx_ring = &qdev->rx_ring[i];
cqicb = (struct cqicb *)rx_ring; cqicb = (struct cqicb *)rx_ring;
...@@ -228,7 +226,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev) ...@@ -228,7 +226,7 @@ static int ql_update_ring_coalescing(struct ql_adapter *qdev)
cpu_to_le16(qdev->rx_max_coalesced_frames); cpu_to_le16(qdev->rx_max_coalesced_frames);
cqicb->flags = FLAGS_LI; cqicb->flags = FLAGS_LI;
status = ql_write_cfg(qdev, cqicb, sizeof(*cqicb), status = ql_write_cfg(qdev, cqicb, sizeof(*cqicb),
CFG_LCQ, rx_ring->cq_id); CFG_LCQ, rx_ring->cq_id);
if (status) { if (status) {
netif_err(qdev, ifup, qdev->ndev, netif_err(qdev, ifup, qdev->ndev,
"Failed to load CQICB.\n"); "Failed to load CQICB.\n");
...@@ -339,8 +337,8 @@ static void ql_get_strings(struct net_device *dev, u32 stringset, u8 *buf) ...@@ -339,8 +337,8 @@ static void ql_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
case ETH_SS_STATS: case ETH_SS_STATS:
for (index = 0; index < QLGE_STATS_LEN; index++) { for (index = 0; index < QLGE_STATS_LEN; index++) {
memcpy(buf + index * ETH_GSTRING_LEN, memcpy(buf + index * ETH_GSTRING_LEN,
ql_gstrings_stats[index].stat_string, ql_gstrings_stats[index].stat_string,
ETH_GSTRING_LEN); ETH_GSTRING_LEN);
} }
break; break;
} }
...@@ -432,7 +430,7 @@ static void ql_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) ...@@ -432,7 +430,7 @@ static void ql_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
/* WOL is only supported for mezz card. */ /* WOL is only supported for mezz card. */
if (ssys_dev == QLGE_MEZZ_SSYS_ID_068 || if (ssys_dev == QLGE_MEZZ_SSYS_ID_068 ||
ssys_dev == QLGE_MEZZ_SSYS_ID_180) { ssys_dev == QLGE_MEZZ_SSYS_ID_180) {
wol->supported = WAKE_MAGIC; wol->supported = WAKE_MAGIC;
wol->wolopts = qdev->wol; wol->wolopts = qdev->wol;
} }
...@@ -445,9 +443,9 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol) ...@@ -445,9 +443,9 @@ static int ql_set_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)
/* WOL is only supported for mezz card. */ /* WOL is only supported for mezz card. */
if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 && if (ssys_dev != QLGE_MEZZ_SSYS_ID_068 &&
ssys_dev != QLGE_MEZZ_SSYS_ID_180) { ssys_dev != QLGE_MEZZ_SSYS_ID_180) {
netif_info(qdev, drv, qdev->ndev, netif_info(qdev, drv, qdev->ndev,
"WOL is only supported for mezz card\n"); "WOL is only supported for mezz card\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (wol->wolopts & ~WAKE_MAGIC) if (wol->wolopts & ~WAKE_MAGIC)
...@@ -507,7 +505,7 @@ static void ql_stop_loopback(struct ql_adapter *qdev) ...@@ -507,7 +505,7 @@ static void ql_stop_loopback(struct ql_adapter *qdev)
} }
static void ql_create_lb_frame(struct sk_buff *skb, static void ql_create_lb_frame(struct sk_buff *skb,
unsigned int frame_size) unsigned int frame_size)
{ {
memset(skb->data, 0xFF, frame_size); memset(skb->data, 0xFF, frame_size);
frame_size &= ~1; frame_size &= ~1;
...@@ -517,13 +515,13 @@ static void ql_create_lb_frame(struct sk_buff *skb, ...@@ -517,13 +515,13 @@ static void ql_create_lb_frame(struct sk_buff *skb,
} }
void ql_check_lb_frame(struct ql_adapter *qdev, void ql_check_lb_frame(struct ql_adapter *qdev,
struct sk_buff *skb) struct sk_buff *skb)
{ {
unsigned int frame_size = skb->len; unsigned int frame_size = skb->len;
if ((*(skb->data + 3) == 0xFF) && if ((*(skb->data + 3) == 0xFF) &&
(*(skb->data + frame_size / 2 + 10) == 0xBE) && (*(skb->data + frame_size / 2 + 10) == 0xBE) &&
(*(skb->data + frame_size / 2 + 12) == 0xAF)) { (*(skb->data + frame_size / 2 + 12) == 0xAF)) {
atomic_dec(&qdev->lb_count); atomic_dec(&qdev->lb_count);
return; return;
} }
...@@ -567,7 +565,7 @@ static int ql_loopback_test(struct ql_adapter *qdev, u64 *data) ...@@ -567,7 +565,7 @@ static int ql_loopback_test(struct ql_adapter *qdev, u64 *data)
} }
static void ql_self_test(struct net_device *ndev, static void ql_self_test(struct net_device *ndev,
struct ethtool_test *eth_test, u64 *data) struct ethtool_test *eth_test, u64 *data)
{ {
struct ql_adapter *qdev = netdev_priv(ndev); struct ql_adapter *qdev = netdev_priv(ndev);
...@@ -673,7 +671,7 @@ static int ql_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *c) ...@@ -673,7 +671,7 @@ static int ql_set_coalesce(struct net_device *ndev, struct ethtool_coalesce *c)
} }
static void ql_get_pauseparam(struct net_device *netdev, static void ql_get_pauseparam(struct net_device *netdev,
struct ethtool_pauseparam *pause) struct ethtool_pauseparam *pause)
{ {
struct ql_adapter *qdev = netdev_priv(netdev); struct ql_adapter *qdev = netdev_priv(netdev);
...@@ -685,7 +683,7 @@ static void ql_get_pauseparam(struct net_device *netdev, ...@@ -685,7 +683,7 @@ static void ql_get_pauseparam(struct net_device *netdev,
} }
static int ql_set_pauseparam(struct net_device *netdev, static int ql_set_pauseparam(struct net_device *netdev,
struct ethtool_pauseparam *pause) struct ethtool_pauseparam *pause)
{ {
struct ql_adapter *qdev = netdev_priv(netdev); struct ql_adapter *qdev = netdev_priv(netdev);
int status = 0; int status = 0;
......
This diff is collapsed.
...@@ -134,7 +134,7 @@ static int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp) ...@@ -134,7 +134,7 @@ static int ql_get_mb_sts(struct ql_adapter *qdev, struct mbox_params *mbcp)
for (i = 0; i < mbcp->out_count; i++) { for (i = 0; i < mbcp->out_count; i++) {
status = status =
ql_read_mpi_reg(qdev, qdev->mailbox_out + i, ql_read_mpi_reg(qdev, qdev->mailbox_out + i,
&mbcp->mbox_out[i]); &mbcp->mbox_out[i]);
if (status) { if (status) {
netif_err(qdev, drv, qdev->ndev, "Failed mailbox read.\n"); netif_err(qdev, drv, qdev->ndev, "Failed mailbox read.\n");
break; break;
...@@ -184,7 +184,7 @@ static int ql_exec_mb_cmd(struct ql_adapter *qdev, struct mbox_params *mbcp) ...@@ -184,7 +184,7 @@ static int ql_exec_mb_cmd(struct ql_adapter *qdev, struct mbox_params *mbcp)
*/ */
for (i = 0; i < mbcp->in_count; i++) { for (i = 0; i < mbcp->in_count; i++) {
status = ql_write_mpi_reg(qdev, qdev->mailbox_in + i, status = ql_write_mpi_reg(qdev, qdev->mailbox_in + i,
mbcp->mbox_in[i]); mbcp->mbox_in[i]);
if (status) if (status)
goto end; goto end;
} }
...@@ -293,7 +293,7 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp) ...@@ -293,7 +293,7 @@ static void ql_link_up(struct ql_adapter *qdev, struct mbox_params *mbcp)
*/ */
ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16)); ql_write32(qdev, INTR_MASK, (INTR_MASK_PI << 16));
queue_delayed_work(qdev->workqueue, queue_delayed_work(qdev->workqueue,
&qdev->mpi_port_cfg_work, 0); &qdev->mpi_port_cfg_work, 0);
} }
ql_link_on(qdev); ql_link_on(qdev);
...@@ -745,7 +745,7 @@ int ql_mb_set_port_cfg(struct ql_adapter *qdev) ...@@ -745,7 +745,7 @@ int ql_mb_set_port_cfg(struct ql_adapter *qdev)
} }
static int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr, static int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr,
u32 size) u32 size)
{ {
int status = 0; int status = 0;
struct mbox_params mbc; struct mbox_params mbc;
...@@ -779,14 +779,14 @@ static int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr, ...@@ -779,14 +779,14 @@ static int ql_mb_dump_ram(struct ql_adapter *qdev, u64 req_dma, u32 addr,
/* Issue a mailbox command to dump RISC RAM. */ /* Issue a mailbox command to dump RISC RAM. */
int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf,
u32 ram_addr, int word_count) u32 ram_addr, int word_count)
{ {
int status; int status;
char *my_buf; char *my_buf;
dma_addr_t buf_dma; dma_addr_t buf_dma;
my_buf = pci_alloc_consistent(qdev->pdev, word_count * sizeof(u32), my_buf = pci_alloc_consistent(qdev->pdev, word_count * sizeof(u32),
&buf_dma); &buf_dma);
if (!my_buf) if (!my_buf)
return -EIO; return -EIO;
...@@ -795,7 +795,7 @@ int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf, ...@@ -795,7 +795,7 @@ int ql_dump_risc_ram_area(struct ql_adapter *qdev, void *buf,
memcpy(buf, my_buf, word_count * sizeof(u32)); memcpy(buf, my_buf, word_count * sizeof(u32));
pci_free_consistent(qdev->pdev, word_count * sizeof(u32), my_buf, pci_free_consistent(qdev->pdev, word_count * sizeof(u32), my_buf,
buf_dma); buf_dma);
return status; return status;
} }
...@@ -918,7 +918,7 @@ static int ql_idc_wait(struct ql_adapter *qdev) ...@@ -918,7 +918,7 @@ static int ql_idc_wait(struct ql_adapter *qdev)
*/ */
wait_time = wait_time =
wait_for_completion_timeout(&qdev->ide_completion, wait_for_completion_timeout(&qdev->ide_completion,
wait_time); wait_time);
if (!wait_time) { if (!wait_time) {
netif_err(qdev, drv, qdev->ndev, "IDC Timeout.\n"); netif_err(qdev, drv, qdev->ndev, "IDC Timeout.\n");
break; break;
...@@ -1125,8 +1125,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work) ...@@ -1125,8 +1125,7 @@ void ql_mpi_port_cfg_work(struct work_struct *work)
} }
if (qdev->link_config & CFG_JUMBO_FRAME_SIZE && if (qdev->link_config & CFG_JUMBO_FRAME_SIZE &&
qdev->max_frame_size == qdev->max_frame_size == CFG_DEFAULT_MAX_FRAME_SIZE)
CFG_DEFAULT_MAX_FRAME_SIZE)
goto end; goto end;
qdev->link_config |= CFG_JUMBO_FRAME_SIZE; qdev->link_config |= CFG_JUMBO_FRAME_SIZE;
...@@ -1273,7 +1272,7 @@ void ql_mpi_reset_work(struct work_struct *work) ...@@ -1273,7 +1272,7 @@ void ql_mpi_reset_work(struct work_struct *work)
netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n"); netif_err(qdev, drv, qdev->ndev, "Core is dumped!\n");
qdev->core_is_dumped = 1; qdev->core_is_dumped = 1;
queue_delayed_work(qdev->workqueue, queue_delayed_work(qdev->workqueue,
&qdev->mpi_core_to_log, 5 * HZ); &qdev->mpi_core_to_log, 5 * HZ);
} }
ql_soft_reset_mpi_risc(qdev); ql_soft_reset_mpi_risc(qdev);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment