diff options
author | Moore, Eric Dean <Eric.Moore@lsil.com> | 2005-11-16 20:54:17 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-13 20:38:44 -0500 |
commit | 7acec1e7556a861416bb6b10f3e3cbb6e82fc01d (patch) | |
tree | 3ca770f11ae152cd17af2a2032f2b13d0370d114 /drivers/message/fusion/mptspi.c | |
parent | f78496da6a85f4b5f4532d7bf85b05fa655146a8 (diff) |
[SCSI] mptfusion - cleaning up xxx_probe error handling
This cleans the returning failure conditions of the
mptsas/mptfc/mptspi probe routines.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
-rw-r--r-- | drivers/message/fusion/mptspi.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 9431d386c72..91bc467477e 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
@@ -178,13 +178,15 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
178 | printk(MYIOC_s_WARN_FMT | 178 | printk(MYIOC_s_WARN_FMT |
179 | "Skipping because it's not operational!\n", | 179 | "Skipping because it's not operational!\n", |
180 | ioc->name); | 180 | ioc->name); |
181 | return -ENODEV; | 181 | error = -ENODEV; |
182 | goto out_mptspi_probe; | ||
182 | } | 183 | } |
183 | 184 | ||
184 | if (!ioc->active) { | 185 | if (!ioc->active) { |
185 | printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n", | 186 | printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n", |
186 | ioc->name); | 187 | ioc->name); |
187 | return -ENODEV; | 188 | error = -ENODEV; |
189 | goto out_mptspi_probe; | ||
188 | } | 190 | } |
189 | 191 | ||
190 | /* Sanity check - ensure at least 1 port is INITIATOR capable | 192 | /* Sanity check - ensure at least 1 port is INITIATOR capable |
@@ -209,7 +211,8 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
209 | printk(MYIOC_s_WARN_FMT | 211 | printk(MYIOC_s_WARN_FMT |
210 | "Unable to register controller with SCSI subsystem\n", | 212 | "Unable to register controller with SCSI subsystem\n", |
211 | ioc->name); | 213 | ioc->name); |
212 | return -1; | 214 | error = -1; |
215 | goto out_mptspi_probe; | ||
213 | } | 216 | } |
214 | 217 | ||
215 | spin_lock_irqsave(&ioc->FreeQlock, flags); | 218 | spin_lock_irqsave(&ioc->FreeQlock, flags); |
@@ -287,7 +290,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
287 | mem = kmalloc(sz, GFP_ATOMIC); | 290 | mem = kmalloc(sz, GFP_ATOMIC); |
288 | if (mem == NULL) { | 291 | if (mem == NULL) { |
289 | error = -ENOMEM; | 292 | error = -ENOMEM; |
290 | goto mptspi_probe_failed; | 293 | goto out_mptspi_probe; |
291 | } | 294 | } |
292 | 295 | ||
293 | memset(mem, 0, sz); | 296 | memset(mem, 0, sz); |
@@ -305,7 +308,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
305 | mem = kmalloc(sz, GFP_ATOMIC); | 308 | mem = kmalloc(sz, GFP_ATOMIC); |
306 | if (mem == NULL) { | 309 | if (mem == NULL) { |
307 | error = -ENOMEM; | 310 | error = -ENOMEM; |
308 | goto mptspi_probe_failed; | 311 | goto out_mptspi_probe; |
309 | } | 312 | } |
310 | 313 | ||
311 | memset(mem, 0, sz); | 314 | memset(mem, 0, sz); |
@@ -386,13 +389,13 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
386 | if(error) { | 389 | if(error) { |
387 | dprintk((KERN_ERR MYNAM | 390 | dprintk((KERN_ERR MYNAM |
388 | "scsi_add_host failed\n")); | 391 | "scsi_add_host failed\n")); |
389 | goto mptspi_probe_failed; | 392 | goto out_mptspi_probe; |
390 | } | 393 | } |
391 | 394 | ||
392 | scsi_scan_host(sh); | 395 | scsi_scan_host(sh); |
393 | return 0; | 396 | return 0; |
394 | 397 | ||
395 | mptspi_probe_failed: | 398 | out_mptspi_probe: |
396 | 399 | ||
397 | mptscsih_remove(pdev); | 400 | mptscsih_remove(pdev); |
398 | return error; | 401 | return error; |