SCSI resends for merge

PATCH In review Alan Cox 2 participants 4 messages Apr 1, 2009

Subsystems (2)

SCSI LSI Logic MPT fusion drivers (FC/SAS/SPI)

lore

Share & tools

lore

Alan Cox

author

2009-04-01 13:59 UTC #0 lore raw

cover SCSI resends for merge

---

Alan Cox (2):
mptsas: remove unneeded check
config: Make need for SCSI_CDROM clearer

 drivers/message/fusion/mptsas.c |    5 ++---
 drivers/scsi/Kconfig            |    9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

Alan Cox

author

2009-04-01 13:59 UTC #1 lore raw

PATCH 1/2 config: Make need for SCSI_CDROM clearer

Mention ATAPI. We could insert an essay about libata and ide-scsi etc but the failure case is someone enables it which is just fine so keep it simple.

(Revised text from suggestion by Matthew Wilcox)

Closes #7736

Signed-off-by Alan Cox <[email protected]>

---

 drivers/scsi/Kconfig |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

drivers/scsi/Kconfig +5 -4

index e2f44e6..2ee76fb 100644
@@ -121,10 +121,11 @@ config BLK_DEV_SR
 	tristate "SCSI CDROM support"
 	depends on SCSI
 	---help---
-	  If you want to use a SCSI or FireWire CD-ROM under Linux,
-	  say Y and read the SCSI-HOWTO and the CDROM-HOWTO at
-	  <http://www.tldp.org/docs.html#howto>. Also make sure to say
-	  Y or M to "ISO 9660 CD-ROM file system support" later.
+	  If you want to use a CD or DVD drive attached to your computer
+	  by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO
+	  and the CDROM-HOWTO at <http://www.tldp.org/docs.html#howto>.
+
+	  Make sure to say Y or M to "ISO 9660 CD-ROM file system support".
 
 	  To compile this driver as a module, choose M here and read
 	  <file:Documentation/scsi/scsi.txt>.

Matthew Wilcox

Reviewed-by on v1 1/2

2009-04-01 15:31 UTC #2 lore raw

Re: [PATCH 1/2] config: Make need for SCSI_CDROM clearer

Quoted 9 lines · Alan Cox

Mention ATAPI. We could insert an essay about libata and ide-scsi etc but the failure case is someone enables it which is just fine so keep it simple.
(Revised text from suggestion by Matthew Wilcox)
Closes #7736
Signed-off-by Alan Cox <[email protected]>

Reviewed-by Matthew Wilcox <[email protected]>

Signature · 4 lines

Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

Alan Cox

author

2009-04-01 13:59 UTC #3 lore raw

PATCH 2/2 mptsas: remove unneeded check

In reply to Alan Cox

From: Alan Cox <[email protected]>

Quoted 1 line

From coverity checker. Closes #9675

Signed-off-by Alan Cox <[email protected]>

---

 drivers/message/fusion/mptsas.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

drivers/message/fusion/mptsas.c +2 -3

index 12b7325..a9019f0 100644
@@ -2279,9 +2279,8 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc)
 	mutex_lock(&ioc->sas_topology_mutex);
 	list_for_each_entry_safe(port_info, n, &ioc->sas_topology, list) {
 
-		if (port_info->phy_info &&
-		    (!(port_info->phy_info[0].identify.device_info &
-		    MPI_SAS_DEVICE_INFO_SMP_TARGET)))
+		if (!(port_info->phy_info[0].identify.device_info &
+		    MPI_SAS_DEVICE_INFO_SMP_TARGET))
 			continue;
 
 		if (mptsas_sas_expander_pg0(ioc, &buffer,