aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwalter harms <wharms@bfs.de>2007-04-26 03:35:09 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-08 12:15:08 -0400
commit84a3c97b93ec5b4509637801a703693bb710cd4c (patch)
tree53208e3356a9364613c551ad91b54cf9eca7f23f
parent39580f2c15485ee7f40923af731b3052f70cb890 (diff)
[SCSI] megaraid: fix warnings when CONFIG_PROC_FS=n
drivers/scsi/megaraid.c: In function 'megaraid_probe_one': drivers/scsi/megaraid.c:4893: warning: implicit declaration of function 'mega_create_proc_entry' drivers/scsi/megaraid.c: In function 'megaraid_remove_one': drivers/scsi/megaraid.c:4968: warning: unused variable 'buf' Fix by adding #defines Signed-off-by: walter harms <wharms@bfs.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/megaraid.c17
-rw-r--r--drivers/scsi/megaraid.h4
2 files changed, 13 insertions, 8 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 7fc6e06ea7e1..65bc130430e2 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -3177,7 +3177,10 @@ proc_rdrv(adapter_t *adapter, char *page, int start, int end )
3177 3177
3178 return len; 3178 return len;
3179} 3179}
3180 3180#else
3181static inline void mega_create_proc_entry(int index, struct proc_dir_entry *parent)
3182{
3183}
3181#endif 3184#endif
3182 3185
3183 3186
@@ -4342,7 +4345,7 @@ mega_support_cluster(adapter_t *adapter)
4342 return 0; 4345 return 0;
4343} 4346}
4344 4347
4345 4348#ifdef CONFIG_PROC_FS
4346/** 4349/**
4347 * mega_adapinq() 4350 * mega_adapinq()
4348 * @adapter - pointer to our soft state 4351 * @adapter - pointer to our soft state
@@ -4447,7 +4450,7 @@ mega_internal_dev_inquiry(adapter_t *adapter, u8 ch, u8 tgt,
4447 4450
4448 return rval; 4451 return rval;
4449} 4452}
4450 4453#endif
4451 4454
4452/** 4455/**
4453 * mega_internal_command() 4456 * mega_internal_command()
@@ -4965,7 +4968,6 @@ megaraid_remove_one(struct pci_dev *pdev)
4965{ 4968{
4966 struct Scsi_Host *host = pci_get_drvdata(pdev); 4969 struct Scsi_Host *host = pci_get_drvdata(pdev);
4967 adapter_t *adapter = (adapter_t *)host->hostdata; 4970 adapter_t *adapter = (adapter_t *)host->hostdata;
4968 char buf[12] = { 0 };
4969 4971
4970 scsi_remove_host(host); 4972 scsi_remove_host(host);
4971 4973
@@ -5011,8 +5013,11 @@ megaraid_remove_one(struct pci_dev *pdev)
5011 remove_proc_entry("raiddrives-30-39", 5013 remove_proc_entry("raiddrives-30-39",
5012 adapter->controller_proc_dir_entry); 5014 adapter->controller_proc_dir_entry);
5013#endif 5015#endif
5014 sprintf(buf, "hba%d", adapter->host->host_no); 5016 {
5015 remove_proc_entry(buf, mega_proc_dir_entry); 5017 char buf[12] = { 0 };
5018 sprintf(buf, "hba%d", adapter->host->host_no);
5019 remove_proc_entry(buf, mega_proc_dir_entry);
5020 }
5016 } 5021 }
5017#endif 5022#endif
5018 5023
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index c6e74643abe2..ee70bd4ae4ba 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -1002,7 +1002,6 @@ static int megaraid_reset(Scsi_Cmnd *);
1002static int megaraid_abort_and_reset(adapter_t *, Scsi_Cmnd *, int); 1002static int megaraid_abort_and_reset(adapter_t *, Scsi_Cmnd *, int);
1003static int megaraid_biosparam(struct scsi_device *, struct block_device *, 1003static int megaraid_biosparam(struct scsi_device *, struct block_device *,
1004 sector_t, int []); 1004 sector_t, int []);
1005static int mega_print_inquiry(char *, char *);
1006 1005
1007static int mega_build_sglist (adapter_t *adapter, scb_t *scb, 1006static int mega_build_sglist (adapter_t *adapter, scb_t *scb,
1008 u32 *buffer, u32 *length); 1007 u32 *buffer, u32 *length);
@@ -1024,6 +1023,7 @@ static int mega_init_scb (adapter_t *);
1024static int mega_is_bios_enabled (adapter_t *); 1023static int mega_is_bios_enabled (adapter_t *);
1025 1024
1026#ifdef CONFIG_PROC_FS 1025#ifdef CONFIG_PROC_FS
1026static int mega_print_inquiry(char *, char *);
1027static void mega_create_proc_entry(int, struct proc_dir_entry *); 1027static void mega_create_proc_entry(int, struct proc_dir_entry *);
1028static int proc_read_config(char *, char **, off_t, int, int *, void *); 1028static int proc_read_config(char *, char **, off_t, int, int *, void *);
1029static int proc_read_stat(char *, char **, off_t, int, int *, void *); 1029static int proc_read_stat(char *, char **, off_t, int, int *, void *);
@@ -1040,10 +1040,10 @@ static int proc_rdrv_20(char *, char **, off_t, int, int *, void *);
1040static int proc_rdrv_30(char *, char **, off_t, int, int *, void *); 1040static int proc_rdrv_30(char *, char **, off_t, int, int *, void *);
1041static int proc_rdrv_40(char *, char **, off_t, int, int *, void *); 1041static int proc_rdrv_40(char *, char **, off_t, int, int *, void *);
1042static int proc_rdrv(adapter_t *, char *, int, int); 1042static int proc_rdrv(adapter_t *, char *, int, int);
1043#endif
1044 1043
1045static int mega_adapinq(adapter_t *, dma_addr_t); 1044static int mega_adapinq(adapter_t *, dma_addr_t);
1046static int mega_internal_dev_inquiry(adapter_t *, u8, u8, dma_addr_t); 1045static int mega_internal_dev_inquiry(adapter_t *, u8, u8, dma_addr_t);
1046#endif
1047 1047
1048static int mega_support_ext_cdb(adapter_t *); 1048static int mega_support_ext_cdb(adapter_t *);
1049static mega_passthru* mega_prepare_passthru(adapter_t *, scb_t *, 1049static mega_passthru* mega_prepare_passthru(adapter_t *, scb_t *,