diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2011-06-14 10:57:31 +0530 | 
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-06-29 16:16:53 -0500 | 
| commit | ab3e5f60d1fc8fe725d02510ff820ff207a8dbef (patch) | |
| tree | 27898e4b38f078469e43c741403be419fdd16d41 /drivers/scsi/mpt2sas/mpt2sas_base.c | |
| parent | 7821578caa8cb831868989041112ab808029ca65 (diff) | |
| download | olio-linux-3.10-ab3e5f60d1fc8fe725d02510ff820ff207a8dbef.tar.xz olio-linux-3.10-ab3e5f60d1fc8fe725d02510ff820ff207a8dbef.zip  | |
[SCSI] mpt2sas: Adding support for customer specific branding
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.c')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 19 | 
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 1da606cb246..83035bd1c48 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c @@ -1740,9 +1740,11 @@ _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc)  static void  _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)  { -	if (ioc->pdev->subsystem_vendor == PCI_VENDOR_ID_INTEL && -	    ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008) { +	if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_INTEL) +		return; +	switch (ioc->pdev->device) { +	case MPI2_MFGPAGE_DEVID_SAS2008:  		switch (ioc->pdev->subsystem_device) {  		case MPT2SAS_INTEL_RMS2LL080_SSDID:  			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, @@ -1752,7 +1754,20 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)  			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  			    MPT2SAS_INTEL_RMS2LL040_BRANDING);  			break; +		default: +			break;  		} +	case MPI2_MFGPAGE_DEVID_SAS2308_2: +		switch (ioc->pdev->subsystem_device) { +		case MPT2SAS_INTEL_RS25GB008_SSDID: +			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, +			    MPT2SAS_INTEL_RS25GB008_BRANDING); +			break; +		default: +			break; +		} +	default: +		break;  	}  }  |