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

Commit 9bd91f3c authored by Joe Perches's avatar Joe Perches
Browse files

brcm80211: Remove extern from function prototypes 



There are a mix of function prototypes with and without extern
in the kernel sources.  Standardize on not using extern for
function prototypes.

Function prototypes don't need to be written with extern.
extern is assumed by the compiler.  Its use is as unnecessary as
using auto to declare automatic/local variables in a block.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
parent a3dabaf0

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+15 −15
Original line number Original line Diff line number Diff line
@@ -632,29 +632,29 @@ struct brcmf_skb_reorder_data { 
	u8 *reorder;

	u8 *reorder;

};

};





extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);

int brcmf_netdev_wait_pend8021x(struct net_device *ndev);





/* Return pointer to interface name */

/* Return pointer to interface name */

extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);

char *brcmf_ifname(struct brcmf_pub *drvr, int idx);





/* Query dongle */

/* Query dongle */

extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,

int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,

				       uint cmd, void *buf, uint len);

			       void *buf, uint len);

extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,

int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,

			     void *buf, uint len);

			     void *buf, uint len);





/* Remove any protocol-specific data header. */

/* Remove any protocol-specific data header. */

extern int brcmf_proto_hdrpull(struct brcmf_pub *drvr, bool do_fws, u8 *ifidx,

int brcmf_proto_hdrpull(struct brcmf_pub *drvr, bool do_fws, u8 *ifidx,

			struct sk_buff *rxp);

			struct sk_buff *rxp);





extern int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);

int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);

extern struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx,

struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,

				     s32 ifidx, char *name, u8 *mac_addr);

			      char *name, u8 *mac_addr);

extern void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx);

void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx);

void brcmf_txflowblock_if(struct brcmf_if *ifp,

void brcmf_txflowblock_if(struct brcmf_if *ifp,

			  enum brcmf_netif_stop_reason reason, bool state);

			  enum brcmf_netif_stop_reason reason, bool state);

extern u32 brcmf_get_chip_info(struct brcmf_if *ifp);

u32 brcmf_get_chip_info(struct brcmf_if *ifp);

extern void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp,

void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp,

		      bool success);

		      bool success);





#endif				/* _BRCMF_H_ */
 
#endif				/* _BRCMF_H_ */

drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h

+13 −14
Original line number Original line Diff line number Diff line
@@ -132,34 +132,33 @@ struct pktq *brcmf_bus_gettxq(struct brcmf_bus *bus) 
 * interface functions from common layer

 * interface functions from common layer

 */

 */





extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,

bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt,

			 struct sk_buff *pkt, int prec);

		      int prec);





/* Receive frame for delivery to OS.  Callee disposes of rxp. */

/* Receive frame for delivery to OS.  Callee disposes of rxp. */

extern void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist);

void brcmf_rx_frames(struct device *dev, struct sk_buff_head *rxlist);





/* Indication from bus module regarding presence/insertion of dongle. */

/* Indication from bus module regarding presence/insertion of dongle. */

extern int brcmf_attach(uint bus_hdrlen, struct device *dev);

int brcmf_attach(uint bus_hdrlen, struct device *dev);

/* Indication from bus module regarding removal/absence of dongle */

/* Indication from bus module regarding removal/absence of dongle */

extern void brcmf_detach(struct device *dev);

void brcmf_detach(struct device *dev);

/* Indication from bus module that dongle should be reset */

/* Indication from bus module that dongle should be reset */

extern void brcmf_dev_reset(struct device *dev);

void brcmf_dev_reset(struct device *dev);

/* Indication from bus module to change flow-control state */

/* Indication from bus module to change flow-control state */

extern void brcmf_txflowblock(struct device *dev, bool state);

void brcmf_txflowblock(struct device *dev, bool state);





/* Notify the bus has transferred the tx packet to firmware */

/* Notify the bus has transferred the tx packet to firmware */

extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,

void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success);

			     bool success);





extern int brcmf_bus_start(struct device *dev);

int brcmf_bus_start(struct device *dev);





#ifdef CONFIG_BRCMFMAC_SDIO

#ifdef CONFIG_BRCMFMAC_SDIO

extern void brcmf_sdio_exit(void);

void brcmf_sdio_exit(void);

extern void brcmf_sdio_init(void);

void brcmf_sdio_init(void);

#endif

#endif

#ifdef CONFIG_BRCMFMAC_USB

#ifdef CONFIG_BRCMFMAC_USB

extern void brcmf_usb_exit(void);

void brcmf_usb_exit(void);

extern void brcmf_usb_init(void);

void brcmf_usb_init(void);

#endif

#endif





#endif				/* _BRCMF_BUS_H_ */
 
#endif				/* _BRCMF_BUS_H_ */

drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -22,21 +22,21 @@ 
 */

 */





/* Linkage, sets prot link and updates hdrlen in pub */

/* Linkage, sets prot link and updates hdrlen in pub */

extern int brcmf_proto_attach(struct brcmf_pub *drvr);

int brcmf_proto_attach(struct brcmf_pub *drvr);





/* Unlink, frees allocated protocol memory (including brcmf_proto) */

/* Unlink, frees allocated protocol memory (including brcmf_proto) */

extern void brcmf_proto_detach(struct brcmf_pub *drvr);

void brcmf_proto_detach(struct brcmf_pub *drvr);





/* Stop protocol: sync w/dongle state. */

/* Stop protocol: sync w/dongle state. */

extern void brcmf_proto_stop(struct brcmf_pub *drvr);

void brcmf_proto_stop(struct brcmf_pub *drvr);





/* Add any protocol-specific data header.

/* Add any protocol-specific data header.

 * Caller must reserve prot_hdrlen prepend space.

 * Caller must reserve prot_hdrlen prepend space.

 */

 */

extern void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx, u8 offset,

void brcmf_proto_hdrpush(struct brcmf_pub *, int ifidx, u8 offset,

			 struct sk_buff *txp);

			 struct sk_buff *txp);





/* Sets dongle media info (drv_version, mac address). */

/* Sets dongle media info (drv_version, mac address). */

extern int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);

int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);





#endif				/* _BRCMF_PROTO_H_ */
 
#endif				/* _BRCMF_PROTO_H_ */

drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h

+11 −12
Original line number Original line Diff line number Diff line
@@ -215,16 +215,15 @@ struct sdpcmd_regs { 
	u16 PAD[0x80];

	u16 PAD[0x80];

};

};





extern int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

int brcmf_sdio_chip_attach(struct brcmf_sdio_dev *sdiodev,

			   struct chip_info **ci_ptr, u32 regs);

			   struct chip_info **ci_ptr, u32 regs);

extern void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);

void brcmf_sdio_chip_detach(struct chip_info **ci_ptr);

extern void brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,

void brcmf_sdio_chip_drivestrengthinit(struct brcmf_sdio_dev *sdiodev,

					      struct chip_info *ci,

				       struct chip_info *ci, u32 drivestrength);

					      u32 drivestrength);

u8 brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid);

extern u8 brcmf_sdio_chip_getinfidx(struct chip_info *ci, u16 coreid);

void brcmf_sdio_chip_enter_download(struct brcmf_sdio_dev *sdiodev,

extern void brcmf_sdio_chip_enter_download(struct brcmf_sdio_dev *sdiodev,

				    struct chip_info *ci);

				    struct chip_info *ci);

extern bool brcmf_sdio_chip_exit_download(struct brcmf_sdio_dev *sdiodev,

bool brcmf_sdio_chip_exit_download(struct brcmf_sdio_dev *sdiodev,

				   struct chip_info *ci, char *nvram_dat,

				   struct chip_info *ci, char *nvram_dat,

				   uint nvram_sz);

				   uint nvram_sz);

drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

+42 −50
Original line number Original line Diff line number Diff line
@@ -181,17 +181,17 @@ struct brcmf_sdio_dev { 
};

};





/* Register/deregister interrupt handler. */

/* Register/deregister interrupt handler. */

extern int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev);

int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev);

extern int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev);

int brcmf_sdio_intr_unregister(struct brcmf_sdio_dev *sdiodev);





/* sdio device register access interface */

/* sdio device register access interface */

extern u8 brcmf_sdio_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);

u8 brcmf_sdio_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);

extern u32 brcmf_sdio_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);

u32 brcmf_sdio_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);

extern void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr,

void brcmf_sdio_regwb(struct brcmf_sdio_dev *sdiodev, u32 addr, u8 data,

			     u8 data, int *ret);

		      int *ret);

extern void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr,

void brcmf_sdio_regwl(struct brcmf_sdio_dev *sdiodev, u32 addr, u32 data,

			     u32 data, int *ret);

		      int *ret);

extern int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,

int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,

			    void *data, bool write);

			    void *data, bool write);





/* Buffer transfer to/from device (client) core via cmd53.

/* Buffer transfer to/from device (client) core via cmd53.
@@ -206,21 +206,16 @@ extern int brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr, 
 * Returns 0 or error code.

 * Returns 0 or error code.

 * NOTE: Async operation is not currently supported.

 * NOTE: Async operation is not currently supported.

 */

 */

extern int

int brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

			  uint flags, struct sk_buff_head *pktq);

			  uint flags, struct sk_buff_head *pktq);

extern int

int brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

			  uint flags, u8 *buf, uint nbytes);

			  uint flags, u8 *buf, uint nbytes);





extern int

int brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

			  uint flags, struct sk_buff *pkt);

			  uint flags, struct sk_buff *pkt);

extern int

int brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

			  uint flags, u8 *buf, uint nbytes);

			  uint flags, u8 *buf, uint nbytes);

extern int

int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,

			    uint flags, struct sk_buff_head *pktq);

			    uint flags, struct sk_buff_head *pktq);





/* Flags bits */

/* Flags bits */
@@ -237,46 +232,43 @@ brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn, 
 *   nbytes:   number of bytes to transfer to/from buf

 *   nbytes:   number of bytes to transfer to/from buf

 * Returns 0 or error code.

 * Returns 0 or error code.

 */

 */

extern int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw,

int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,

			       u32 addr, u8 *buf, uint nbytes);

			u8 *buf, uint nbytes);

extern int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write,

int brcmf_sdio_ramrw(struct brcmf_sdio_dev *sdiodev, bool write, u32 address,

			    u32 address, u8 *data, uint size);

		     u8 *data, uint size);





/* Issue an abort to the specified function */

/* Issue an abort to the specified function */

extern int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);

int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn);





/* platform specific/high level functions */

/* platform specific/high level functions */

extern int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev);

int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev);

extern int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev);

int brcmf_sdio_remove(struct brcmf_sdio_dev *sdiodev);





/* attach, return handler on success, NULL if failed.

/* attach, return handler on success, NULL if failed.

 *  The handler shall be provided by all subsequent calls. No local cache

 *  The handler shall be provided by all subsequent calls. No local cache

 *  cfghdl points to the starting address of pci device mapped memory

 *  cfghdl points to the starting address of pci device mapped memory

 */

 */

extern int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev);

int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev);

extern void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev);

void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev);





/* read or write one byte using cmd52 */

/* read or write one byte using cmd52 */

extern int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw,

int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint fnc,

				    uint fnc, uint addr, u8 *byte);

			     uint addr, u8 *byte);





/* read or write 2/4 bytes using cmd53 */

/* read or write 2/4 bytes using cmd53 */

extern int

int brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev, uint rw, uint fnc,

brcmf_sdioh_request_word(struct brcmf_sdio_dev *sdiodev,

			     uint addr, u32 *word, uint nbyte);

			 uint rw, uint fnc, uint addr,

			 u32 *word, uint nbyte);





/* Watchdog timer interface for pm ops */

/* Watchdog timer interface for pm ops */

extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev,

void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, bool enable);

				    bool enable);





extern void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev);

void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev);

extern void brcmf_sdbrcm_disconnect(void *ptr);

void brcmf_sdbrcm_disconnect(void *ptr);

extern void brcmf_sdbrcm_isr(void *arg);

void brcmf_sdbrcm_isr(void *arg);





extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);

void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);





extern void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev,

void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev,

			  wait_queue_head_t *wq);

			  wait_queue_head_t *wq);

extern bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev);

bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev);

#endif				/* _BRCM_SDH_H_ */
 
#endif				/* _BRCM_SDH_H_ */