Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52fd8ca6 authored by Vegard Nossum's avatar Vegard Nossum Committed by Roland Dreier
Browse files

IB/ipath: Use unsigned long for irq flags 



A few functions in the ipath driver incorrectly use unsigned int to
hold irq flags for spin_lock_irqsave().

This patch was generated using the Coccinelle framework with the
following semantic patch:

The semantic patch I used was this:

@@
expression lock;
identifier flags;
expression subclass;
@@

- unsigned int flags;
+ unsigned long flags;

...

<+...

(
 spin_lock_irqsave(lock, flags)
|
 _spin_lock_irqsave(lock)
|
 spin_unlock_irqrestore(lock, flags)
|
 _spin_unlock_irqrestore(lock, flags)
|
 read_lock_irqsave(lock, flags)
|
 _read_lock_irqsave(lock)
|
 read_unlock_irqrestore(lock, flags)
|
 _read_unlock_irqrestore(lock, flags)
|
 write_lock_irqsave(lock, flags)
|
 _write_lock_irqsave(lock)
|
 write_unlock_irqrestore(lock, flags)
|
 _write_unlock_irqrestore(lock, flags)
|
 spin_lock_irqsave_nested(lock, flags, subclass)
|
 _spin_lock_irqsave_nested(lock, subclass)
|
 spin_unlock_irqrestore(lock, flags)
|
 _spin_unlock_irqrestore(lock, flags)
|
 _raw_spin_lock_flags(lock, flags)
|
 __raw_spin_lock_flags(lock, flags)
)

...+>

Cc: Ralph Campbell <ralph.campbell@qlogic.com>
Cc: Julia Lawall <julia@diku.dk>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 6e86841d

drivers/infiniband/hw/ipath/ipath_verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ static void sdma_complete(void *cookie, int status) 
	struct ipath_verbs_txreq *tx = cookie;

	struct ipath_qp *qp = tx->qp;

	struct ipath_ibdev *dev = to_idev(qp->ibqp.device);

	unsigned int flags;

	unsigned long flags;

	enum ib_wc_status ibs = status == IPATH_SDMA_TXREQ_S_OK ?

		IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR;
@@ -1051,7 +1051,7 @@ static void sdma_complete(void *cookie, int status) 


static void decrement_dma_busy(struct ipath_qp *qp)

{

	unsigned int flags;

	unsigned long flags;



	if (atomic_dec_and_test(&qp->s_dma_busy)) {

		spin_lock_irqsave(&qp->s_lock, flags);
@@ -1221,7 +1221,7 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp, 
	unsigned flush_wc;

	u32 control;

	int ret;

	unsigned int flags;

	unsigned long flags;



	piobuf = ipath_getpiobuf(dd, plen, NULL);

	if (unlikely(piobuf == NULL)) {