aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas/mpt2sas_ctl.c
diff options
context:
space:
mode:
authorEric Moore <eric.moore@lsi.com>2009-03-15 23:37:18 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-03-17 21:52:46 -0400
commitba33fadfabe88e838e73c76a6ff59546f5f6b92b (patch)
tree7419c722f12bd22a705c95c181f6e4bc07a4f9ba /drivers/scsi/mpt2sas/mpt2sas_ctl.c
parent70a9b8734660698eb91efb8947a9e691d40235e1 (diff)
[SCSI] mpt2sas: make global symbols unique
The ioc_list global symbol is already used in 1st generation mpt fusion drivers, so this patch makes it unique in the 2nd generation driver. I've checked the entire sources, and I don't see any other global system missing the mpt2sas_xxx prefix. Signed-off-by: Eric Moore <eric.moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.c')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_ctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index 4fbe3f83319b..2d4f85c9d7a1 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -355,7 +355,7 @@ _ctl_verify_adapter(int ioc_number, struct MPT2SAS_ADAPTER **iocpp)
355{ 355{
356 struct MPT2SAS_ADAPTER *ioc; 356 struct MPT2SAS_ADAPTER *ioc;
357 357
358 list_for_each_entry(ioc, &ioc_list, list) { 358 list_for_each_entry(ioc, &mpt2sas_ioc_list, list) {
359 if (ioc->id != ioc_number) 359 if (ioc->id != ioc_number)
360 continue; 360 continue;
361 *iocpp = ioc; 361 *iocpp = ioc;
@@ -439,7 +439,7 @@ _ctl_poll(struct file *filep, poll_table *wait)
439 439
440 poll_wait(filep, &ctl_poll_wait, wait); 440 poll_wait(filep, &ctl_poll_wait, wait);
441 441
442 list_for_each_entry(ioc, &ioc_list, list) { 442 list_for_each_entry(ioc, &mpt2sas_ioc_list, list) {
443 if (ioc->aen_event_read_flag) 443 if (ioc->aen_event_read_flag)
444 return POLLIN | POLLRDNORM; 444 return POLLIN | POLLRDNORM;
445 } 445 }
@@ -2497,7 +2497,7 @@ mpt2sas_ctl_exit(void)
2497 struct MPT2SAS_ADAPTER *ioc; 2497 struct MPT2SAS_ADAPTER *ioc;
2498 int i; 2498 int i;
2499 2499
2500 list_for_each_entry(ioc, &ioc_list, list) { 2500 list_for_each_entry(ioc, &mpt2sas_ioc_list, list) {
2501 2501
2502 /* free memory associated to diag buffers */ 2502 /* free memory associated to diag buffers */
2503 for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { 2503 for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) {