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

Commit ad24d6f0 authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

bna: fix timeout API argument type 



Timeout functions are defined with 'void *' ptr argument. They should
be defined directly with 'struct bfa_ioc *' type to avoid type conversions.

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16712c53

drivers/net/ethernet/brocade/bna/bfa_ioc.c

+5 −11
Original line number Original line Diff line number Diff line
@@ -1895,10 +1895,8 @@ bfa_ioc_hwinit(struct bfa_ioc *ioc, bool force) 
}

}





void

void

bfa_nw_ioc_timeout(void *ioc_arg)

bfa_nw_ioc_timeout(struct bfa_ioc *ioc)

{

{

	struct bfa_ioc *ioc = (struct bfa_ioc *) ioc_arg;



	bfa_fsm_send_event(ioc, IOC_E_TIMEOUT);

	bfa_fsm_send_event(ioc, IOC_E_TIMEOUT);

}

}
@@ -1963,9 +1961,8 @@ bfa_ioc_send_getattr(struct bfa_ioc *ioc) 
}

}





void

void

bfa_nw_ioc_hb_check(void *cbarg)

bfa_nw_ioc_hb_check(struct bfa_ioc *ioc)

{

{

	struct bfa_ioc *ioc = cbarg;

	u32 hb_count;

	u32 hb_count;





	hb_count = readl(ioc->ioc_regs.heartbeat);

	hb_count = readl(ioc->ioc_regs.heartbeat);
@@ -2983,9 +2980,8 @@ bfa_iocpf_stop(struct bfa_ioc *ioc) 
}

}





void

void

bfa_nw_iocpf_timeout(void *ioc_arg)

bfa_nw_iocpf_timeout(struct bfa_ioc *ioc)

{

{

	struct bfa_ioc  *ioc = (struct bfa_ioc *) ioc_arg;

	enum bfa_iocpf_state iocpf_st;

	enum bfa_iocpf_state iocpf_st;





	iocpf_st = bfa_sm_to_state(iocpf_sm_table, ioc->iocpf.fsm);

	iocpf_st = bfa_sm_to_state(iocpf_sm_table, ioc->iocpf.fsm);
@@ -2997,10 +2993,8 @@ bfa_nw_iocpf_timeout(void *ioc_arg) 
}

}





void

void

bfa_nw_iocpf_sem_timeout(void *ioc_arg)

bfa_nw_iocpf_sem_timeout(struct bfa_ioc *ioc)

{

{

	struct bfa_ioc  *ioc = (struct bfa_ioc *) ioc_arg;



	bfa_ioc_hw_sem_get(ioc);

	bfa_ioc_hw_sem_get(ioc);

}

}

drivers/net/ethernet/brocade/bna/bfa_ioc.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -304,10 +304,10 @@ int bfa_nw_ioc_debug_fwsave(struct bfa_ioc *ioc, void *trcdata, int *trclen); 
/*

/*

 * Timeout APIs

 * Timeout APIs

 */

 */

void bfa_nw_ioc_timeout(void *ioc);

void bfa_nw_ioc_timeout(struct bfa_ioc *ioc);

void bfa_nw_ioc_hb_check(void *ioc);

void bfa_nw_ioc_hb_check(struct bfa_ioc *ioc);

void bfa_nw_iocpf_timeout(void *ioc);

void bfa_nw_iocpf_timeout(struct bfa_ioc *ioc);

void bfa_nw_iocpf_sem_timeout(void *ioc);

void bfa_nw_iocpf_sem_timeout(struct bfa_ioc *ioc);





/*

/*

 * F/W Image Size & Chunk

 * F/W Image Size & Chunk

drivers/net/ethernet/brocade/bna/bnad.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1703,7 +1703,7 @@ bnad_ioc_timeout(unsigned long data) 
	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&bnad->bna_lock, flags);

	spin_lock_irqsave(&bnad->bna_lock, flags);

	bfa_nw_ioc_timeout((void *) &bnad->bna.ioceth.ioc);

	bfa_nw_ioc_timeout(&bnad->bna.ioceth.ioc);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

}

}
@@ -1714,7 +1714,7 @@ bnad_ioc_hb_check(unsigned long data) 
	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&bnad->bna_lock, flags);

	spin_lock_irqsave(&bnad->bna_lock, flags);

	bfa_nw_ioc_hb_check((void *) &bnad->bna.ioceth.ioc);

	bfa_nw_ioc_hb_check(&bnad->bna.ioceth.ioc);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

}

}
@@ -1725,7 +1725,7 @@ bnad_iocpf_timeout(unsigned long data) 
	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&bnad->bna_lock, flags);

	spin_lock_irqsave(&bnad->bna_lock, flags);

	bfa_nw_iocpf_timeout((void *) &bnad->bna.ioceth.ioc);

	bfa_nw_iocpf_timeout(&bnad->bna.ioceth.ioc);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

}

}
@@ -1736,7 +1736,7 @@ bnad_iocpf_sem_timeout(unsigned long data) 
	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&bnad->bna_lock, flags);

	spin_lock_irqsave(&bnad->bna_lock, flags);

	bfa_nw_iocpf_sem_timeout((void *) &bnad->bna.ioceth.ioc);

	bfa_nw_iocpf_sem_timeout(&bnad->bna.ioceth.ioc);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

	spin_unlock_irqrestore(&bnad->bna_lock, flags);

}

}