Commit b9ccc256 authored by Coiby Xu's avatar Coiby Xu Committed by Greg Kroah-Hartman
Browse files

staging: qlge: re-write qlge_init_device 

Stop calling ql_release_all in qlge_init_device and free things one step
at a time.

struct qlge_adapter *qdev is now a private structure of struct devlink
and memset is not necessary.

Link: https://lore.kernel.org/patchwork/patch/1321092/#1516928


Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarCoiby Xu <coiby.xu@gmail.com>
Link: https://lore.kernel.org/r/20210123104613.38359-4-coiby.xu@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 953b9400

drivers/staging/qlge/qlge_main.c

+20 −12
Original line number Original line Diff line number Diff line
@@ -4394,13 +4394,13 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
	err = pcie_set_readrq(pdev, 4096);

	err = pcie_set_readrq(pdev, 4096);

	if (err) {

	if (err) {

		dev_err(&pdev->dev, "Set readrq failed.\n");

		dev_err(&pdev->dev, "Set readrq failed.\n");

		goto err_out1;

		goto err_disable_pci;

	}

	}





	err = pci_request_regions(pdev, DRV_NAME);

	err = pci_request_regions(pdev, DRV_NAME);

	if (err) {

	if (err) {

		dev_err(&pdev->dev, "PCI region request failed.\n");

		dev_err(&pdev->dev, "PCI region request failed.\n");

		return err;

		goto err_disable_pci;

	}

	}





	pci_set_master(pdev);

	pci_set_master(pdev);
@@ -4416,7 +4416,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 




	if (err) {

	if (err) {

		dev_err(&pdev->dev, "No usable DMA configuration.\n");

		dev_err(&pdev->dev, "No usable DMA configuration.\n");

		goto err_out2;

		goto err_release_pci;

	}

	}





	/* Set PCIe reset type for EEH to fundamental. */

	/* Set PCIe reset type for EEH to fundamental. */
@@ -4427,7 +4427,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
	if (!qdev->reg_base) {

	if (!qdev->reg_base) {

		dev_err(&pdev->dev, "Register mapping failed.\n");

		dev_err(&pdev->dev, "Register mapping failed.\n");

		err = -ENOMEM;

		err = -ENOMEM;

		goto err_out2;

		goto err_release_pci;

	}

	}





	qdev->doorbell_area_size = pci_resource_len(pdev, 3);

	qdev->doorbell_area_size = pci_resource_len(pdev, 3);
@@ -4436,14 +4436,14 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
	if (!qdev->doorbell_area) {

	if (!qdev->doorbell_area) {

		dev_err(&pdev->dev, "Doorbell register mapping failed.\n");

		dev_err(&pdev->dev, "Doorbell register mapping failed.\n");

		err = -ENOMEM;

		err = -ENOMEM;

		goto err_out2;

		goto err_iounmap_base;

	}

	}





	err = qlge_get_board_info(qdev);

	err = qlge_get_board_info(qdev);

	if (err) {

	if (err) {

		dev_err(&pdev->dev, "Register access failed.\n");

		dev_err(&pdev->dev, "Register access failed.\n");

		err = -EIO;

		err = -EIO;

		goto err_out2;

		goto err_iounmap_doorbell;

	}

	}

	qdev->msg_enable = netif_msg_init(debug, default_msg);

	qdev->msg_enable = netif_msg_init(debug, default_msg);

	spin_lock_init(&qdev->stats_lock);

	spin_lock_init(&qdev->stats_lock);
@@ -4453,7 +4453,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
			vmalloc(sizeof(struct qlge_mpi_coredump));

			vmalloc(sizeof(struct qlge_mpi_coredump));

		if (!qdev->mpi_coredump) {

		if (!qdev->mpi_coredump) {

			err = -ENOMEM;

			err = -ENOMEM;

			goto err_out2;

			goto err_iounmap_doorbell;

		}

		}

		if (qlge_force_coredump)

		if (qlge_force_coredump)

			set_bit(QL_FRC_COREDUMP, &qdev->flags);

			set_bit(QL_FRC_COREDUMP, &qdev->flags);
@@ -4462,7 +4462,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
	err = qdev->nic_ops->get_flash(qdev);

	err = qdev->nic_ops->get_flash(qdev);

	if (err) {

	if (err) {

		dev_err(&pdev->dev, "Invalid FLASH.\n");

		dev_err(&pdev->dev, "Invalid FLASH.\n");

		goto err_out2;

		goto err_free_mpi_coredump;

	}

	}





	/* Keep local copy of current mac address. */

	/* Keep local copy of current mac address. */
@@ -4485,7 +4485,7 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
						  ndev->name);

						  ndev->name);

	if (!qdev->workqueue) {

	if (!qdev->workqueue) {

		err = -ENOMEM;

		err = -ENOMEM;

		goto err_out2;

		goto err_free_mpi_coredump;

	}

	}





	INIT_DELAYED_WORK(&qdev->asic_reset_work, qlge_asic_reset_work);

	INIT_DELAYED_WORK(&qdev->asic_reset_work, qlge_asic_reset_work);
@@ -4503,10 +4503,18 @@ static int qlge_init_device(struct pci_dev *pdev, struct qlge_adapter *qdev, 
			 DRV_NAME, DRV_VERSION);

			 DRV_NAME, DRV_VERSION);

	}

	}

	return 0;

	return 0;

err_out2:



	qlge_release_all(pdev);

err_free_mpi_coredump:

err_out1:

	vfree(qdev->mpi_coredump);

err_iounmap_doorbell:

	iounmap(qdev->doorbell_area);

err_iounmap_base:

	iounmap(qdev->reg_base);

err_release_pci:

	pci_release_regions(pdev);

err_disable_pci:

	pci_disable_device(pdev);

	pci_disable_device(pdev);



	return err;

	return err;

}

}