diff options
| author | Eric Moore <[email protected]> | 2009-03-16 03:37:18 +0000 |
|---|---|---|
| committer | James Bottomley <[email protected]> | 2009-03-18 01:52:46 +0000 |
| commit | ba33fadfabe88e838e73c76a6ff59546f5f6b92b (patch) | |
| tree | 7419c722f12bd22a705c95c181f6e4bc07a4f9ba /drivers/scsi/mpt2sas/mpt2sas_ctl.c | |
| parent | [SCSI] sd: Make revalidate less chatty (diff) | |
| download | kernel-ba33fadfabe88e838e73c76a6ff59546f5f6b92b.tar.gz kernel-ba33fadfabe88e838e73c76a6ff59546f5f6b92b.zip | |
[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 <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.c')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 6 |
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) { struct MPT2SAS_ADAPTER *ioc; - list_for_each_entry(ioc, &ioc_list, list) { + list_for_each_entry(ioc, &mpt2sas_ioc_list, list) { if (ioc->id != ioc_number) continue; *iocpp = ioc; @@ -439,7 +439,7 @@ _ctl_poll(struct file *filep, poll_table *wait) poll_wait(filep, &ctl_poll_wait, wait); - list_for_each_entry(ioc, &ioc_list, list) { + list_for_each_entry(ioc, &mpt2sas_ioc_list, list) { if (ioc->aen_event_read_flag) return POLLIN | POLLRDNORM; } @@ -2497,7 +2497,7 @@ mpt2sas_ctl_exit(void) struct MPT2SAS_ADAPTER *ioc; int i; - list_for_each_entry(ioc, &ioc_list, list) { + list_for_each_entry(ioc, &mpt2sas_ioc_list, list) { /* free memory associated to diag buffers */ for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { |