Commit 7acec1e7 authored by Moore, Eric Dean's avatar Moore, Eric Dean Committed by James Bottomley
Browse files

[SCSI] mptfusion - cleaning up xxx_probe error handling 



This cleans the returning failure conditions of the
mptsas/mptfc/mptspi probe routines.

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent f78496da

drivers/message/fusion/mptfc.c

+10 −7
Original line number Diff line number Diff line
@@ -168,13 +168,15 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(MYIOC_s_WARN_FMT

		  "Skipping because it's not operational!\n",

		  ioc->name);

		return -ENODEV;

		error = -ENODEV;

		goto out_mptfc_probe;

	}



	if (!ioc->active) {

		printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",

		  ioc->name);

		return -ENODEV;

		error = -ENODEV;

		goto out_mptfc_probe;

	}



	/*  Sanity check - ensure at least 1 port is INITIATOR capable
@@ -199,7 +201,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(MYIOC_s_WARN_FMT

			"Unable to register controller with SCSI subsystem\n",

			ioc->name);

                return -1;

		error = -1;

		goto out_mptfc_probe;

        }



	spin_lock_irqsave(&ioc->FreeQlock, flags);
@@ -267,7 +270,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	mem = kmalloc(sz, GFP_ATOMIC);

	if (mem == NULL) {

		error = -ENOMEM;

		goto mptfc_probe_failed;

		goto out_mptfc_probe;

	}



	memset(mem, 0, sz);
@@ -285,7 +288,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	mem = kmalloc(sz, GFP_ATOMIC);

	if (mem == NULL) {

		error = -ENOMEM;

		goto mptfc_probe_failed;

		goto out_mptfc_probe;

	}



	memset(mem, 0, sz);
@@ -331,13 +334,13 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if(error) {

		dprintk((KERN_ERR MYNAM

		  "scsi_add_host failed\n"));

		goto mptfc_probe_failed;

		goto out_mptfc_probe;

	}



	scsi_scan_host(sh);

	return 0;



mptfc_probe_failed:

out_mptfc_probe:



	mptscsih_remove(pdev);

	return error;

drivers/message/fusion/mptsas.c

+10 −7
Original line number Diff line number Diff line
@@ -1134,13 +1134,15 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(MYIOC_s_WARN_FMT

		  "Skipping because it's not operational!\n",

		  ioc->name);

		return -ENODEV;

		error = -ENODEV;

		goto out_mptsas_probe;

	}



	if (!ioc->active) {

		printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",

		  ioc->name);

		return -ENODEV;

		error = -ENODEV;

		goto out_mptsas_probe;

	}



	/*  Sanity check - ensure at least 1 port is INITIATOR capable
@@ -1164,7 +1166,8 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(MYIOC_s_WARN_FMT

			"Unable to register controller with SCSI subsystem\n",

			ioc->name);

                return -1;

		error = -1;

		goto out_mptsas_probe;

        }



	spin_lock_irqsave(&ioc->FreeQlock, flags);
@@ -1238,7 +1241,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	mem = kmalloc(sz, GFP_ATOMIC);

	if (mem == NULL) {

		error = -ENOMEM;

		goto mptsas_probe_failed;

		goto out_mptsas_probe;

	}



	memset(mem, 0, sz);
@@ -1256,7 +1259,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	mem = kmalloc(sz, GFP_ATOMIC);

	if (mem == NULL) {

		error = -ENOMEM;

		goto mptsas_probe_failed;

		goto out_mptsas_probe;

	}



	memset(mem, 0, sz);
@@ -1309,14 +1312,14 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (error) {

		dprintk((KERN_ERR MYNAM

		  "scsi_add_host failed\n"));

		goto mptsas_probe_failed;

		goto out_mptsas_probe;

	}



	mptsas_scan_sas_topology(ioc);



	return 0;



mptsas_probe_failed:

out_mptsas_probe:



	mptscsih_remove(pdev);

	return error;

drivers/message/fusion/mptspi.c

+10 −7
Original line number Diff line number Diff line
@@ -178,13 +178,15 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(MYIOC_s_WARN_FMT

		  "Skipping because it's not operational!\n",

		  ioc->name);

		return -ENODEV;

		error = -ENODEV;

		goto out_mptspi_probe;

	}



	if (!ioc->active) {

		printk(MYIOC_s_WARN_FMT "Skipping because it's disabled!\n",

		  ioc->name);

		return -ENODEV;

		error = -ENODEV;

		goto out_mptspi_probe;

	}



	/*  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) 
		printk(MYIOC_s_WARN_FMT

			"Unable to register controller with SCSI subsystem\n",

			ioc->name);

                return -1;

		error = -1;

		goto out_mptspi_probe;

        }



	spin_lock_irqsave(&ioc->FreeQlock, flags);
@@ -287,7 +290,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	mem = kmalloc(sz, GFP_ATOMIC);

	if (mem == NULL) {

		error = -ENOMEM;

		goto mptspi_probe_failed;

		goto out_mptspi_probe;

	}



	memset(mem, 0, sz);
@@ -305,7 +308,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	mem = kmalloc(sz, GFP_ATOMIC);

	if (mem == NULL) {

		error = -ENOMEM;

		goto mptspi_probe_failed;

		goto out_mptspi_probe;

	}



	memset(mem, 0, sz);
@@ -386,13 +389,13 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if(error) {

		dprintk((KERN_ERR MYNAM

		  "scsi_add_host failed\n"));

		goto mptspi_probe_failed;

		goto out_mptspi_probe;

	}



	scsi_scan_host(sh);

	return 0;



mptspi_probe_failed:

out_mptspi_probe:



	mptscsih_remove(pdev);

	return error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE