[PATCH 0/2] SCSI resends for merge

[PATCH 0/2] SCSI resends for merge

[Alan Cox]

---

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(-)

-- 

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

[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 <alan@lxorguk.ukuu.org.uk>
---

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


diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e2f44e6..2ee76fb 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -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>.

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

[Matthew Wilcox]

On Wed, Apr 01, 2009 at 03:00:18PM +0100, Alan Cox wrote:
> 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 <alan@lxorguk.ukuu.org.uk>

Reviewed-by: Matthew Wilcox <willy@linux.intel.com>

-- 
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."

[PATCH 2/2] mptsas: remove unneeded check

[Alan Cox]

From: Alan Cox <alan@redhat.com>

>From coverity checker. Closes #9675

Signed-off-by: Alan Cox <alan@redhat.com>
---

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


diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 12b7325..a9019f0 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -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,