diff options
Diffstat (limited to 'drivers/scsi/pcmcia')
-rw-r--r-- | drivers/scsi/pcmcia/aha152x_stub.c | 3 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/fdomain_stub.c | 3 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 3 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.h | 1 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/qlogic_stub.c | 3 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/sym53c500_cs.c | 3 |
6 files changed, 0 insertions, 16 deletions
diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index c1de4ba1f0a5..9d70aef99227 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c | |||
@@ -80,7 +80,6 @@ MODULE_LICENSE("Dual MPL/GPL"); | |||
80 | 80 | ||
81 | typedef struct scsi_info_t { | 81 | typedef struct scsi_info_t { |
82 | struct pcmcia_device *p_dev; | 82 | struct pcmcia_device *p_dev; |
83 | dev_node_t node; | ||
84 | struct Scsi_Host *host; | 83 | struct Scsi_Host *host; |
85 | } scsi_info_t; | 84 | } scsi_info_t; |
86 | 85 | ||
@@ -185,8 +184,6 @@ static int aha152x_config_cs(struct pcmcia_device *link) | |||
185 | goto failed; | 184 | goto failed; |
186 | } | 185 | } |
187 | 186 | ||
188 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | ||
189 | link->dev_node = &info->node; | ||
190 | info->host = host; | 187 | info->host = host; |
191 | 188 | ||
192 | return 0; | 189 | return 0; |
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 8cb6d71f0204..21b141151dfc 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c | |||
@@ -63,7 +63,6 @@ MODULE_LICENSE("Dual MPL/GPL"); | |||
63 | 63 | ||
64 | typedef struct scsi_info_t { | 64 | typedef struct scsi_info_t { |
65 | struct pcmcia_device *p_dev; | 65 | struct pcmcia_device *p_dev; |
66 | dev_node_t node; | ||
67 | struct Scsi_Host *host; | 66 | struct Scsi_Host *host; |
68 | } scsi_info_t; | 67 | } scsi_info_t; |
69 | 68 | ||
@@ -155,8 +154,6 @@ static int fdomain_config(struct pcmcia_device *link) | |||
155 | goto failed; | 154 | goto failed; |
156 | scsi_scan_host(host); | 155 | scsi_scan_host(host); |
157 | 156 | ||
158 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | ||
159 | link->dev_node = &info->node; | ||
160 | info->host = host; | 157 | info->host = host; |
161 | 158 | ||
162 | return 0; | 159 | return 0; |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 24c78ed98f07..0f0e112c3f8e 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -1754,8 +1754,6 @@ static int nsp_cs_config(struct pcmcia_device *link) | |||
1754 | 1754 | ||
1755 | scsi_scan_host(host); | 1755 | scsi_scan_host(host); |
1756 | 1756 | ||
1757 | snprintf(info->node.dev_name, sizeof(info->node.dev_name), "scsi%d", host->host_no); | ||
1758 | link->dev_node = &info->node; | ||
1759 | info->host = host; | 1757 | info->host = host; |
1760 | 1758 | ||
1761 | /* Finally, report what we've done */ | 1759 | /* Finally, report what we've done */ |
@@ -1813,7 +1811,6 @@ static void nsp_cs_release(struct pcmcia_device *link) | |||
1813 | if (info->host != NULL) { | 1811 | if (info->host != NULL) { |
1814 | scsi_remove_host(info->host); | 1812 | scsi_remove_host(info->host); |
1815 | } | 1813 | } |
1816 | link->dev_node = NULL; | ||
1817 | 1814 | ||
1818 | if (link->win) { | 1815 | if (link->win) { |
1819 | if (data != NULL) { | 1816 | if (data != NULL) { |
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h index 8c61a4fe1db9..d68c9f267c5e 100644 --- a/drivers/scsi/pcmcia/nsp_cs.h +++ b/drivers/scsi/pcmcia/nsp_cs.h | |||
@@ -224,7 +224,6 @@ | |||
224 | typedef struct scsi_info_t { | 224 | typedef struct scsi_info_t { |
225 | struct pcmcia_device *p_dev; | 225 | struct pcmcia_device *p_dev; |
226 | struct Scsi_Host *host; | 226 | struct Scsi_Host *host; |
227 | dev_node_t node; | ||
228 | int stop; | 227 | int stop; |
229 | } scsi_info_t; | 228 | } scsi_info_t; |
230 | 229 | ||
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index c3a4428dbcff..f0fc6baed9fc 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c | |||
@@ -82,7 +82,6 @@ static struct scsi_host_template qlogicfas_driver_template = { | |||
82 | 82 | ||
83 | typedef struct scsi_info_t { | 83 | typedef struct scsi_info_t { |
84 | struct pcmcia_device *p_dev; | 84 | struct pcmcia_device *p_dev; |
85 | dev_node_t node; | ||
86 | struct Scsi_Host *host; | 85 | struct Scsi_Host *host; |
87 | unsigned short manf_id; | 86 | unsigned short manf_id; |
88 | } scsi_info_t; | 87 | } scsi_info_t; |
@@ -235,8 +234,6 @@ static int qlogic_config(struct pcmcia_device * link) | |||
235 | goto failed; | 234 | goto failed; |
236 | } | 235 | } |
237 | 236 | ||
238 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | ||
239 | link->dev_node = &info->node; | ||
240 | info->host = host; | 237 | info->host = host; |
241 | 238 | ||
242 | return 0; | 239 | return 0; |
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index 6eacf4ca200f..a51164171179 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c | |||
@@ -191,7 +191,6 @@ | |||
191 | 191 | ||
192 | struct scsi_info_t { | 192 | struct scsi_info_t { |
193 | struct pcmcia_device *p_dev; | 193 | struct pcmcia_device *p_dev; |
194 | dev_node_t node; | ||
195 | struct Scsi_Host *host; | 194 | struct Scsi_Host *host; |
196 | unsigned short manf_id; | 195 | unsigned short manf_id; |
197 | }; | 196 | }; |
@@ -792,8 +791,6 @@ SYM53C500_config(struct pcmcia_device *link) | |||
792 | */ | 791 | */ |
793 | data->fast_pio = USE_FAST_PIO; | 792 | data->fast_pio = USE_FAST_PIO; |
794 | 793 | ||
795 | sprintf(info->node.dev_name, "scsi%d", host->host_no); | ||
796 | link->dev_node = &info->node; | ||
797 | info->host = host; | 794 | info->host = host; |
798 | 795 | ||
799 | if (scsi_add_host(host, NULL)) | 796 | if (scsi_add_host(host, NULL)) |