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

Commit 758ccc34 authored by Rasesh Mody's avatar Rasesh Mody Committed by David S. Miller
Browse files

bna: Header File Consolidation 



Change details:
 - Consolidated bfa_sm.h and bfa_wc.h into bfa_cs.h

Signed-off-by: default avatarRasesh Mody <rmody@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9b08a4fc

drivers/net/bna/bfa_sm.h→drivers/net/bna/bfa_cs.h

+65 −13
Original line number Diff line number Diff line
@@ -11,20 +11,24 @@ 
 * General Public License for more details.

 */

/*

 * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.

 * Copyright (c) 2005-2011 Brocade Communications Systems, Inc.

 * All rights reserved

 * www.brocade.com

 */



/**

 * @file bfasm.h State machine defines

 * @file bfa_cs.h BFA common services

 */



#ifndef __BFA_SM_H__

#define __BFA_SM_H__

#ifndef __BFA_CS_H__

#define __BFA_CS_H__



#include "cna.h"



/**

 * @ BFA state machine interfaces

 */



typedef void (*bfa_sm_t)(void *sm, int event);



/**
@@ -85,4 +89,52 @@ bfa_sm_to_state(const struct bfa_sm_table *smt, bfa_sm_t sm) 
		i++;

	return smt[i].state;

}

#endif
 


/**

 * @ Generic wait counter.

 */



typedef void (*bfa_wc_resume_t) (void *cbarg);



struct bfa_wc {

	bfa_wc_resume_t wc_resume;

	void		*wc_cbarg;

	int		wc_count;

};



static inline void

bfa_wc_up(struct bfa_wc *wc)

{

	wc->wc_count++;

}



static inline void

bfa_wc_down(struct bfa_wc *wc)

{

	wc->wc_count--;

	if (wc->wc_count == 0)

		wc->wc_resume(wc->wc_cbarg);

}



/**

 * Initialize a waiting counter.

 */

static inline void

bfa_wc_init(struct bfa_wc *wc, bfa_wc_resume_t wc_resume, void *wc_cbarg)

{

	wc->wc_resume = wc_resume;

	wc->wc_cbarg = wc_cbarg;

	wc->wc_count = 0;

	bfa_wc_up(wc);

}



/**

 * Wait for counter to reach zero

 */

static inline void

bfa_wc_wait(struct bfa_wc *wc)

{

	bfa_wc_down(wc);

}



#endif /* __BFA_CS_H__ */

drivers/net/bna/bfa_ioc.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#ifndef __BFA_IOC_H__

#define __BFA_IOC_H__



#include "bfa_sm.h"

#include "bfa_cs.h"

#include "bfi.h"

#include "cna.h"

drivers/net/bna/bfa_wc.h

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
/*

 * Linux network driver for Brocade Converged Network Adapter.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License (GPL) Version 2 as

 * published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */

/*

 * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.

 * All rights reserved

 * www.brocade.com

 */



/**

 * @file bfa_wc.h Generic wait counter.

 */



#ifndef __BFA_WC_H__

#define __BFA_WC_H__



typedef void (*bfa_wc_resume_t) (void *cbarg);



struct bfa_wc {

	bfa_wc_resume_t wc_resume;

	void		*wc_cbarg;

	int		wc_count;

};



static inline void

bfa_wc_up(struct bfa_wc *wc)

{

	wc->wc_count++;

}



static inline void

bfa_wc_down(struct bfa_wc *wc)

{

	wc->wc_count--;

	if (wc->wc_count == 0)

		wc->wc_resume(wc->wc_cbarg);

}



/**

 * Initialize a waiting counter.

 */

static inline void

bfa_wc_init(struct bfa_wc *wc, bfa_wc_resume_t wc_resume, void *wc_cbarg)

{

	wc->wc_resume = wc_resume;

	wc->wc_cbarg = wc_cbarg;

	wc->wc_count = 0;

	bfa_wc_up(wc);

}



/**

 * Wait for counter to reach zero

 */

static inline void

bfa_wc_wait(struct bfa_wc *wc)

{

	bfa_wc_down(wc);

}



#endif

drivers/net/bna/bna.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#ifndef __BNA_H__

#define __BNA_H__



#include "bfa_wc.h"

#include "bfa_cs.h"

#include "bfa_ioc.h"

#include "cna.h"

#include "bfi_ll.h"

drivers/net/bna/bna_ctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
 * www.brocade.com

 */

#include "bna.h"

#include "bfa_sm.h"

#include "bfa_wc.h"

#include "bfa_cs.h"



static void bna_device_cb_port_stopped(void *arg, enum bna_cb_status status);