Commit 51c00535 authored by Coiby Xu's avatar Coiby Xu Committed by Greg Kroah-Hartman
Browse files

staging: qlge: fix build breakage with dumping enabled 



This fixes commit 0107635e
("staging: qlge: replace pr_err with netdev_err") which introduced an
build breakage of missing `struct ql_adapter *qdev` for some functions
and a warning of type mismatch with dumping enabled, i.e.,

$ make CFLAGS_MODULE="-DQL_ALL_DUMP -DQL_OB_DUMP -DQL_CB_DUMP \
    -DQL_IB_DUMP -DQL_REG_DUMP -DQL_DEV_DUMP" M=drivers/staging/qlge

qlge_dbg.c: In function ‘ql_dump_ob_mac_rsp’:
qlge_dbg.c:2051:13: error: ‘qdev’ undeclared (first use in this function); did you mean ‘cdev’?
 2051 |  netdev_err(qdev->ndev, "%s\n", __func__);
      |             ^~~~
qlge_dbg.c: In function ‘ql_dump_routing_entries’:
qlge_dbg.c:1435:10: warning: format ‘%s’ expects argument of type ‘char *’, but argument 3 has type ‘int’ [-Wformat=]
 1435 |        "%s: Routing Mask %d = 0x%.08x\n",
      |         ~^
      |          |
      |          char *
      |         %d
 1436 |        i, value);
      |        ~
      |        |
      |        int
qlge_dbg.c:1435:37: warning: format ‘%x’ expects a matching ‘unsigned int’ argument [-Wformat=]
 1435 |        "%s: Routing Mask %d = 0x%.08x\n",
      |                                 ~~~~^
      |                                     |
      |                                     unsigned int

Note that now ql_dump_rx_ring/ql_dump_tx_ring won't check if the passed
parameter is a null pointer.

Fixes: 0107635e ("staging: qlge: replace pr_err with netdev_err")
Reported-by: default avatarBenjamin Poirier <benjamin.poirier@gmail.com>
Suggested-by: default avatarBenjamin Poirier <benjamin.poirier@gmail.com>
Reviewed-by: default avatarBenjamin Poirier <benjamin.poirier@gmail.com>
Signed-off-by: default avatarCoiby Xu <coiby.xu@gmail.com>
Link: https://lore.kernel.org/r/20201002235941.77062-1-coiby.xu@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a944a1fb

drivers/staging/qlge/qlge.h

+10 −10
Original line number Diff line number Diff line
@@ -2338,21 +2338,21 @@ void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id); 
#endif



#ifdef QL_OB_DUMP

void ql_dump_tx_desc(struct tx_buf_desc *tbd);

void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb);

void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp);

#define QL_DUMP_OB_MAC_IOCB(ob_mac_iocb) ql_dump_ob_mac_iocb(ob_mac_iocb)

#define QL_DUMP_OB_MAC_RSP(ob_mac_rsp) ql_dump_ob_mac_rsp(ob_mac_rsp)

void ql_dump_tx_desc(struct ql_adapter *qdev, struct tx_buf_desc *tbd);

void ql_dump_ob_mac_iocb(struct ql_adapter *qdev, struct ob_mac_iocb_req *ob_mac_iocb);

void ql_dump_ob_mac_rsp(struct ql_adapter *qdev, struct ob_mac_iocb_rsp *ob_mac_rsp);

#define QL_DUMP_OB_MAC_IOCB(qdev, ob_mac_iocb) ql_dump_ob_mac_iocb(qdev, ob_mac_iocb)

#define QL_DUMP_OB_MAC_RSP(qdev, ob_mac_rsp) ql_dump_ob_mac_rsp(qdev, ob_mac_rsp)

#else

#define QL_DUMP_OB_MAC_IOCB(ob_mac_iocb)

#define QL_DUMP_OB_MAC_RSP(ob_mac_rsp)

#define QL_DUMP_OB_MAC_IOCB(qdev, ob_mac_iocb)

#define QL_DUMP_OB_MAC_RSP(qdev, ob_mac_rsp)

#endif



#ifdef QL_IB_DUMP

void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp);

#define QL_DUMP_IB_MAC_RSP(ib_mac_rsp) ql_dump_ib_mac_rsp(ib_mac_rsp)

void ql_dump_ib_mac_rsp(struct ql_adapter *qdev, struct ib_mac_iocb_rsp *ib_mac_rsp);

#define QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp) ql_dump_ib_mac_rsp(qdev, ib_mac_rsp)

#else

#define QL_DUMP_IB_MAC_RSP(ib_mac_rsp)

#define QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp)

#endif



#ifdef	QL_ALL_DUMP

drivers/staging/qlge/qlge_dbg.c

+18 −10
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ void ql_dump_routing_entries(struct ql_adapter *qdev) 
		}

		if (value)

			netdev_err(qdev->ndev,

				   "%s: Routing Mask %d = 0x%.08x\n",

				   "Routing Mask %d = 0x%.08x\n",

				   i, value);

	}

	ql_sem_unlock(qdev, SEM_RT_IDX_MASK);
@@ -1617,6 +1617,9 @@ void ql_dump_qdev(struct ql_adapter *qdev) 
#ifdef QL_CB_DUMP

void ql_dump_wqicb(struct wqicb *wqicb)

{

	struct tx_ring *tx_ring = container_of(wqicb, struct tx_ring, wqicb);

	struct ql_adapter *qdev = tx_ring->qdev;



	netdev_err(qdev->ndev, "Dumping wqicb stuff...\n");

	netdev_err(qdev->ndev, "wqicb->len = 0x%x\n", le16_to_cpu(wqicb->len));

	netdev_err(qdev->ndev, "wqicb->flags = %x\n",
@@ -1632,8 +1635,8 @@ void ql_dump_wqicb(struct wqicb *wqicb) 


void ql_dump_tx_ring(struct tx_ring *tx_ring)

{

	if (!tx_ring)

		return;

	struct ql_adapter *qdev = tx_ring->qdev;



	netdev_err(qdev->ndev, "===================== Dumping tx_ring %d ===============\n",

		   tx_ring->wq_id);

	netdev_err(qdev->ndev, "tx_ring->base = %p\n", tx_ring->wq_base);
@@ -1657,6 +1660,8 @@ void ql_dump_tx_ring(struct tx_ring *tx_ring) 
void ql_dump_ricb(struct ricb *ricb)

{

	int i;

	struct ql_adapter *qdev =

		container_of(ricb, struct ql_adapter, ricb);



	netdev_err(qdev->ndev, "===================== Dumping ricb ===============\n");

	netdev_err(qdev->ndev, "Dumping ricb stuff...\n");
@@ -1686,6 +1691,9 @@ void ql_dump_ricb(struct ricb *ricb) 


void ql_dump_cqicb(struct cqicb *cqicb)

{

	struct rx_ring *rx_ring = container_of(cqicb, struct rx_ring, cqicb);

	struct ql_adapter *qdev = rx_ring->qdev;



	netdev_err(qdev->ndev, "Dumping cqicb stuff...\n");



	netdev_err(qdev->ndev, "cqicb->msix_vect = %d\n", cqicb->msix_vect);
@@ -1725,8 +1733,8 @@ static const char *qlge_rx_ring_type_name(struct rx_ring *rx_ring) 


void ql_dump_rx_ring(struct rx_ring *rx_ring)

{

	if (!rx_ring)

		return;

	struct ql_adapter *qdev = rx_ring->qdev;



	netdev_err(qdev->ndev,

		   "===================== Dumping rx_ring %d ===============\n",

		   rx_ring->cq_id);
@@ -1816,7 +1824,7 @@ fail_it: 
#endif



#ifdef QL_OB_DUMP

void ql_dump_tx_desc(struct tx_buf_desc *tbd)

void ql_dump_tx_desc(struct ql_adapter *qdev, struct tx_buf_desc *tbd)

{

	netdev_err(qdev->ndev, "tbd->addr  = 0x%llx\n",

		   le64_to_cpu((u64)tbd->addr));
@@ -1843,7 +1851,7 @@ void ql_dump_tx_desc(struct tx_buf_desc *tbd) 
		   tbd->len & TX_DESC_E ? "E" : ".");

}



void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb)

void ql_dump_ob_mac_iocb(struct ql_adapter *qdev, struct ob_mac_iocb_req *ob_mac_iocb)

{

	struct ob_mac_tso_iocb_req *ob_mac_tso_iocb =

	    (struct ob_mac_tso_iocb_req *)ob_mac_iocb;
@@ -1886,10 +1894,10 @@ void ql_dump_ob_mac_iocb(struct ob_mac_iocb_req *ob_mac_iocb) 
		frame_len = le16_to_cpu(ob_mac_iocb->frame_len);

	}

	tbd = &ob_mac_iocb->tbd[0];

	ql_dump_tx_desc(tbd);

	ql_dump_tx_desc(qdev, tbd);

}



void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp)

void ql_dump_ob_mac_rsp(struct ql_adapter *qdev, struct ob_mac_iocb_rsp *ob_mac_rsp)

{

	netdev_err(qdev->ndev, "%s\n", __func__);

	netdev_err(qdev->ndev, "opcode         = %d\n", ob_mac_rsp->opcode);
@@ -1906,7 +1914,7 @@ void ql_dump_ob_mac_rsp(struct ob_mac_iocb_rsp *ob_mac_rsp) 
#endif



#ifdef QL_IB_DUMP

void ql_dump_ib_mac_rsp(struct ib_mac_iocb_rsp *ib_mac_rsp)

void ql_dump_ib_mac_rsp(struct ql_adapter *qdev, struct ib_mac_iocb_rsp *ib_mac_rsp)

{

	netdev_err(qdev->ndev, "%s\n", __func__);

	netdev_err(qdev->ndev, "opcode         = 0x%x\n", ib_mac_rsp->opcode);

drivers/staging/qlge/qlge_main.c

+4 −4
Original line number Diff line number Diff line
@@ -1856,7 +1856,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev, 
	struct net_device *ndev = qdev->ndev;

	struct sk_buff *skb = NULL;



	QL_DUMP_IB_MAC_RSP(ib_mac_rsp);

	QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp);



	skb = ql_build_rx_skb(qdev, rx_ring, ib_mac_rsp);

	if (unlikely(!skb)) {
@@ -1954,7 +1954,7 @@ static unsigned long ql_process_mac_rx_intr(struct ql_adapter *qdev, 
			((le16_to_cpu(ib_mac_rsp->vlan_id) &

			IB_MAC_IOCB_RSP_VLAN_MASK)) : 0xffff;



	QL_DUMP_IB_MAC_RSP(ib_mac_rsp);

	QL_DUMP_IB_MAC_RSP(qdev, ib_mac_rsp);



	if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {

		/* The data and headers are split into
@@ -2001,7 +2001,7 @@ static void ql_process_mac_tx_intr(struct ql_adapter *qdev, 
	struct tx_ring *tx_ring;

	struct tx_ring_desc *tx_ring_desc;



	QL_DUMP_OB_MAC_RSP(mac_rsp);

	QL_DUMP_OB_MAC_RSP(qdev, mac_rsp);

	tx_ring = &qdev->tx_ring[mac_rsp->txq_idx];

	tx_ring_desc = &tx_ring->q[mac_rsp->tid];

	ql_unmap_send(qdev, tx_ring_desc, tx_ring_desc->map_cnt);
@@ -2592,7 +2592,7 @@ static netdev_tx_t qlge_send(struct sk_buff *skb, struct net_device *ndev) 
		tx_ring->tx_errors++;

		return NETDEV_TX_BUSY;

	}

	QL_DUMP_OB_MAC_IOCB(mac_iocb_ptr);

	QL_DUMP_OB_MAC_IOCB(qdev, mac_iocb_ptr);

	tx_ring->prod_idx++;

	if (tx_ring->prod_idx == tx_ring->wq_len)

		tx_ring->prod_idx = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE