diff options
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r-- | drivers/scsi/megaraid.c | 17 |
1 files changed, 11 insertions, 6 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 | |
3181 | static 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 | ||