diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/aacraid/aachba.c | 10 | ||||
-rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 1 | ||||
-rw-r--r-- | drivers/scsi/aacraid/commctrl.c | 4 | ||||
-rw-r--r-- | drivers/scsi/aacraid/comminit.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aacraid/commsup.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aacraid/sa.c | 2 |
7 files changed, 11 insertions, 12 deletions
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index f3fc35386060..66d48e0c4cd7 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c | |||
@@ -562,10 +562,10 @@ static void setinqstr(int devtype, void *data, int tindex) | |||
562 | inqstrcpy ("V1.0", str->prl); | 562 | inqstrcpy ("V1.0", str->prl); |
563 | } | 563 | } |
564 | 564 | ||
565 | void set_sense(u8 *sense_buf, u8 sense_key, u8 sense_code, | 565 | static void set_sense(u8 *sense_buf, u8 sense_key, u8 sense_code, |
566 | u8 a_sense_code, u8 incorrect_length, | 566 | u8 a_sense_code, u8 incorrect_length, |
567 | u8 bit_pointer, u16 field_pointer, | 567 | u8 bit_pointer, u16 field_pointer, |
568 | u32 residue) | 568 | u32 residue) |
569 | { | 569 | { |
570 | sense_buf[0] = 0xF0; /* Sense data valid, err code 70h (current error) */ | 570 | sense_buf[0] = 0xF0; /* Sense data valid, err code 70h (current error) */ |
571 | sense_buf[1] = 0; /* Segment number, always zero */ | 571 | sense_buf[1] = 0; /* Segment number, always zero */ |
@@ -813,7 +813,7 @@ static void write_callback(void *context, struct fib * fibptr) | |||
813 | aac_io_done(scsicmd); | 813 | aac_io_done(scsicmd); |
814 | } | 814 | } |
815 | 815 | ||
816 | int aac_read(struct scsi_cmnd * scsicmd, int cid) | 816 | static int aac_read(struct scsi_cmnd * scsicmd, int cid) |
817 | { | 817 | { |
818 | u32 lba; | 818 | u32 lba; |
819 | u32 count; | 819 | u32 count; |
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 700d90331c1c..3f89ee995130 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -1597,7 +1597,6 @@ int fib_setup(struct aac_dev *dev); | |||
1597 | void fib_map_free(struct aac_dev *dev); | 1597 | void fib_map_free(struct aac_dev *dev); |
1598 | void fib_free(struct fib * context); | 1598 | void fib_free(struct fib * context); |
1599 | void fib_init(struct fib * context); | 1599 | void fib_init(struct fib * context); |
1600 | void fib_dealloc(struct fib * context); | ||
1601 | void aac_printf(struct aac_dev *dev, u32 val); | 1600 | void aac_printf(struct aac_dev *dev, u32 val); |
1602 | int fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt); | 1601 | int fib_send(u16 command, struct fib * context, unsigned long size, int priority, int wait, int reply, fib_callback callback, void *ctxt); |
1603 | int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry); | 1602 | int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry); |
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c index 30dd1f7120f4..d9a93f8a728d 100644 --- a/drivers/scsi/aacraid/commctrl.c +++ b/drivers/scsi/aacraid/commctrl.c | |||
@@ -405,7 +405,7 @@ static int check_revision(struct aac_dev *dev, void __user *arg) | |||
405 | * | 405 | * |
406 | */ | 406 | */ |
407 | 407 | ||
408 | int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) | 408 | static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) |
409 | { | 409 | { |
410 | struct fib* srbfib; | 410 | struct fib* srbfib; |
411 | int status; | 411 | int status; |
@@ -625,7 +625,7 @@ struct aac_pci_info { | |||
625 | }; | 625 | }; |
626 | 626 | ||
627 | 627 | ||
628 | int aac_get_pci_info(struct aac_dev* dev, void __user *arg) | 628 | static int aac_get_pci_info(struct aac_dev* dev, void __user *arg) |
629 | { | 629 | { |
630 | struct aac_pci_info pci_info; | 630 | struct aac_pci_info pci_info; |
631 | 631 | ||
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index 6832a55ca907..c3d3bce74378 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c | |||
@@ -204,7 +204,7 @@ int aac_send_shutdown(struct aac_dev * dev) | |||
204 | * 0 - If there were errors initing. This is a fatal error. | 204 | * 0 - If there were errors initing. This is a fatal error. |
205 | */ | 205 | */ |
206 | 206 | ||
207 | int aac_comm_init(struct aac_dev * dev) | 207 | static int aac_comm_init(struct aac_dev * dev) |
208 | { | 208 | { |
209 | unsigned long hdrsize = (sizeof(u32) * NUMBER_OF_COMM_QUEUES) * 2; | 209 | unsigned long hdrsize = (sizeof(u32) * NUMBER_OF_COMM_QUEUES) * 2; |
210 | unsigned long queuesize = sizeof(struct aac_entry) * TOTAL_QUEUE_ENTRIES; | 210 | unsigned long queuesize = sizeof(struct aac_entry) * TOTAL_QUEUE_ENTRIES; |
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 3f36dbaa2bb3..2d6bae661790 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -211,7 +211,7 @@ void fib_init(struct fib *fibptr) | |||
211 | * caller. | 211 | * caller. |
212 | */ | 212 | */ |
213 | 213 | ||
214 | void fib_dealloc(struct fib * fibptr) | 214 | static void fib_dealloc(struct fib * fibptr) |
215 | { | 215 | { |
216 | struct hw_fib *hw_fib = fibptr->hw_fib; | 216 | struct hw_fib *hw_fib = fibptr->hw_fib; |
217 | if(hw_fib->header.StructType != FIB_MAGIC) | 217 | if(hw_fib->header.StructType != FIB_MAGIC) |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index c9b82687ba1a..9f1be6cb2c18 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -215,7 +215,7 @@ static int aac_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd | |||
215 | * Returns a static string describing the device in question | 215 | * Returns a static string describing the device in question |
216 | */ | 216 | */ |
217 | 217 | ||
218 | const char *aac_info(struct Scsi_Host *shost) | 218 | static const char *aac_info(struct Scsi_Host *shost) |
219 | { | 219 | { |
220 | struct aac_dev *dev = (struct aac_dev *)shost->hostdata; | 220 | struct aac_dev *dev = (struct aac_dev *)shost->hostdata; |
221 | return aac_drivers[dev->cardtype].name; | 221 | return aac_drivers[dev->cardtype].name; |
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c index bd6c30723fba..01cf1d9acae7 100644 --- a/drivers/scsi/aacraid/sa.c +++ b/drivers/scsi/aacraid/sa.c | |||
@@ -89,7 +89,7 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
89 | * Notify the adapter of an event | 89 | * Notify the adapter of an event |
90 | */ | 90 | */ |
91 | 91 | ||
92 | void aac_sa_notify_adapter(struct aac_dev *dev, u32 event) | 92 | static void aac_sa_notify_adapter(struct aac_dev *dev, u32 event) |
93 | { | 93 | { |
94 | switch (event) { | 94 | switch (event) { |
95 | 95 | ||