[PATCH 0/3] [SCSI] Small scsi fixes and cleanups

[PATCH 0/3] [SCSI] Small scsi fixes and cleanups

[Rolf Eike Beer]

This small series sends out my current minor SCSI fixes.

01: aic7xxx: mark ahd_pci_ident_table and ahd_num_pci_devs static
02: remove extra newline from info message
    This extra newline causes dmesg and syslog to contain a completely 
    empty line for every scanned controller
03: Fix scsi/scsi_transport.h compile error
    If you don't get the magic include order for this file right it will 
    fail compilation. Pull in the correct include to this file so it will 
    always work.

Eike

[PATCH 2/3] [SCSI] remove extra newline from info message

[Rolf Eike Beer]

[SCSI] remove extra newline from info message

This extra newline character introduces a completely empty line in dmesg as
the calling function itself adds a newline.

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>

---
commit fdae83cc4c0e84e19609688c439a87083b816414
tree cd73ce0abcbee1ff4844b29e9427c8115b45dee8
parent c083dac8517da8e3a2b0dfa1e2ac9166638cfc76
author Rolf Eike Beer <eike-kernel@sf-tec.de> Thu, 06 Jul 2006 13:42:46 +0200
committer Rolf Eike Beer <beer@siso-eb-i34d.silicon-software.de> Thu, 06 Jul 2006 14:17:15 +0200

 drivers/scsi/aic7xxx/aic79xx_osm.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index b244c71..6c9608c 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -418,7 +418,6 @@ ahd_linux_info(struct Scsi_Host *host)
 	strcat(bp, "        ");
 	ahd_controller_info(ahd, ahd_info);
 	strcat(bp, ahd_info);
-	strcat(bp, "\n");
 
 	return (bp);
 }

[PATCH 1/3] [SCSI] aic7xxx: mark ahd_pci_ident_table and ahd_num_pci_devs static

[Rolf Eike Beer]

[SCSI] aic7xxx: mark ahd_pci_ident_table and ahd_num_pci_devs static

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>

---
commit c083dac8517da8e3a2b0dfa1e2ac9166638cfc76
tree 5b568d88875ff46634752dd3889ed968f0543fc2
parent d3df850ce80c56524cdb7d31695d04490b7d012b
author Rolf Eike Beer <eike-kernel@sf-tec.de> Thu, 06 Jul 2006 13:31:23 +0200
committer Rolf Eike Beer <beer@siso-eb-i34d.silicon-software.de> Thu, 06 Jul 2006 14:17:15 +0200

 drivers/scsi/aic7xxx/aic79xx.h     |    2 --
 drivers/scsi/aic7xxx/aic79xx_pci.c |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index df3346b..d3b93cc 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -1320,8 +1320,6 @@ struct ahd_pci_identity {
 	char			*name;
 	ahd_device_setup_t	*setup;
 };
-extern struct ahd_pci_identity ahd_pci_ident_table [];
-extern const u_int ahd_num_pci_devs;
 
 /***************************** VL/EISA Declarations ***************************/
 struct aic7770_identity {
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 14850f3..c95f06b 100644
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -97,7 +97,7 @@ static ahd_device_setup_t ahd_aic7901A_s
 static ahd_device_setup_t ahd_aic7902_setup;
 static ahd_device_setup_t ahd_aic790X_setup;
 
-struct ahd_pci_identity ahd_pci_ident_table [] =
+static const struct ahd_pci_identity ahd_pci_ident_table [] =
 {
 	/* aic7901 based controllers */
 	{
@@ -201,7 +201,7 @@ struct ahd_pci_identity ahd_pci_ident_ta
 	}
 };
 
-const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table);
+static const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table);
 		
 #define	DEVCONFIG		0x40
 #define		PCIXINITPAT	0x0000E000ul

[PATCH 3/3] Fix scsi/scsi_transport.h compile error

[Rolf Eike Beer]

Fix scsi/scsi_transport.h compile error

scsi_transport.h defines the inline function scsi_transport_device_data()
that dereferences a pointer of "struct scsi_device *". Since the struct is
not known by the header this might break compilation.

Include scsi/scsi_device.h to not rely on users doing the correct magic
include order.

Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>

---
commit 2ce61cfef5642b3a7414d2f430acf179f50f7228
tree 4d9c48a499dd47028bf28dfdd931c501efc32db3
parent 788fd16e408ca6c1008829d52bca9f13cbec64ce
author Rolf Eike Beer <eike-kernel@sf-tec.de> Mon, 31 Jul 2006 09:08:09 +0200
committer Rolf Eike Beer <beer@siso-eb-i34d.silicon-software.de> Mon, 31 Jul 2006 09:08:09 +0200

 include/scsi/scsi_transport.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/scsi/scsi_transport.h b/include/scsi/scsi_transport.h
index cca1d49..3c18baa 100644
--- a/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@ -22,6 +22,7 @@ #define SCSI_TRANSPORT_H
 
 #include <linux/transport_class.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
 
 struct scsi_transport_template {
 	/* the attribute containers */