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

Commit 9695a25d authored by Adrian Bunk's avatar Adrian Bunk Committed by James Bottomley
Browse files

[SCSI] aacraid: cleanups 



- proper prototypes for global code in aacraid.h
- aac_rx_start_adapter() can now become static

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatar"Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3cfff0fc

drivers/scsi/aacraid/aacraid.h

+3 −0
Original line number Diff line number Diff line
@@ -1843,8 +1843,11 @@ struct aac_driver_ident* aac_get_driver_ident(int devtype); 
int aac_get_adapter_info(struct aac_dev* dev);

int aac_send_shutdown(struct aac_dev *dev);

int aac_probe_container(struct aac_dev *dev, int cid);

int _aac_rx_init(struct aac_dev *dev);

int aac_rx_select_comm(struct aac_dev *dev, int comm);

extern int numacb;

extern int acbsize;

extern char aac_driver_version[];

extern int startup_timeout;

extern int aif_timeout;

extern int expose_physicals;

drivers/scsi/aacraid/linit.c

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ static LIST_HEAD(aac_devices); 
static int aac_cfg_major = -1;

char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;



extern int expose_physicals;



/*

 * Because of the way Linux names scsi devices, the order in this table has

 * become important.  Check for on-board Raid first, add-in cards second.

drivers/scsi/aacraid/nark.c

+0 −3
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ static int aac_nark_ioremap(struct aac_dev * dev, u32 size) 


int aac_nark_init(struct aac_dev * dev)

{

	extern int _aac_rx_init(struct aac_dev *dev);

	extern int aac_rx_select_comm(struct aac_dev *dev, int comm);



	/*

	 *	Fill in the function dispatch table.

	 */

drivers/scsi/aacraid/rkt.c

+0 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
static int aac_rkt_select_comm(struct aac_dev *dev, int comm)

{

	int retval;

	extern int aac_rx_select_comm(struct aac_dev *dev, int comm);

	retval = aac_rx_select_comm(dev, comm);

	if (comm == AAC_COMM_MESSAGE) {

		/*
@@ -97,8 +96,6 @@ static int aac_rkt_ioremap(struct aac_dev * dev, u32 size) 


int aac_rkt_init(struct aac_dev *dev)

{

	extern int _aac_rx_init(struct aac_dev *dev);



	/*

	 *	Fill in the function dispatch table.

	 */

drivers/scsi/aacraid/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void aac_rx_notify_adapter(struct aac_dev *dev, u32 event) 
 *	Start up processing on an i960 based AAC adapter

 */



void aac_rx_start_adapter(struct aac_dev *dev)

static void aac_rx_start_adapter(struct aac_dev *dev)

{

	struct aac_init *init;