diff options
author | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-29 21:18:54 -0800 |
commit | eaf2a47f40f01ef793d2fc50cf03d199846013ca (patch) | |
tree | 0646365688ca76306aaa17ce7983944f5ec411b0 /drivers/net/ethernet/qlogic/qed/qed_dev.c | |
parent | c829f5f52db9bae0379b98fca2645f6ca9b0fb1e (diff) | |
parent | 62967898789dc1f09a06e59fa85ae2c5ca4dc2da (diff) | |
download | linux-stable-eaf2a47f40f01ef793d2fc50cf03d199846013ca.tar.gz linux-stable-eaf2a47f40f01ef793d2fc50cf03d199846013ca.tar.bz2 linux-stable-eaf2a47f40f01ef793d2fc50cf03d199846013ca.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed_dev.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index b17003d9066c..e2cbd77646a2 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c @@ -795,19 +795,19 @@ static void qed_init_qm_pq(struct qed_hwfn *p_hwfn, /* get pq index according to PQ_FLAGS */ static u16 *qed_init_qm_get_idx_from_flags(struct qed_hwfn *p_hwfn, - u32 pq_flags) + unsigned long pq_flags) { struct qed_qm_info *qm_info = &p_hwfn->qm_info; /* Can't have multiple flags set here */ - if (bitmap_weight((unsigned long *)&pq_flags, + if (bitmap_weight(&pq_flags, sizeof(pq_flags) * BITS_PER_BYTE) > 1) { - DP_ERR(p_hwfn, "requested multiple pq flags 0x%x\n", pq_flags); + DP_ERR(p_hwfn, "requested multiple pq flags 0x%lx\n", pq_flags); goto err; } if (!(qed_get_pq_flags(p_hwfn) & pq_flags)) { - DP_ERR(p_hwfn, "pq flag 0x%x is not set\n", pq_flags); + DP_ERR(p_hwfn, "pq flag 0x%lx is not set\n", pq_flags); goto err; } |