Commit d6f1e89b authored by Sean Anderson's avatar Sean Anderson Committed by Jakub Kicinski
Browse files

sunhme: Return an ERR_PTR from quattro_pci_find 



In order to differentiate between a missing bridge and an OOM condition,
return ERR_PTRs from quattro_pci_find. This also does some general linting
in the area.

Signed-off-by: default avatarSean Anderson <seanga2@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent acb3f35f

drivers/net/ethernet/sun/sunhme.c

+27 −22
Original line number Diff line number Diff line
@@ -2498,18 +2498,16 @@ static struct quattro *quattro_sbus_find(struct platform_device *child) 
		return qp;



	qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);

	if (qp != NULL) {

		int i;

	if (!qp)

		return NULL;



		for (i = 0; i < 4; i++)

			qp->happy_meals[i] = NULL;

	memset(qp->happy_meals, 0, sizeof(*qp->happy_meals));



	qp->quattro_dev = child;

	qp->next = qfe_sbus_list;

	qfe_sbus_list = qp;



	platform_set_drvdata(op, qp);

	}

	return qp;

}
@@ -2569,19 +2567,23 @@ static void quattro_sbus_free_irqs(void) 
#ifdef CONFIG_PCI

static struct quattro *quattro_pci_find(struct pci_dev *pdev)

{

	int i;

	struct pci_dev *bdev = pdev->bus->self;

	struct quattro *qp;



	if (!bdev) return NULL;

	if (!bdev)

		return ERR_PTR(-ENODEV);



	for (qp = qfe_pci_list; qp != NULL; qp = qp->next) {

		struct pci_dev *qpdev = qp->quattro_dev;



		if (qpdev == bdev)

			return qp;

	}



	qp = kmalloc(sizeof(struct quattro), GFP_KERNEL);

	if (qp != NULL) {

		int i;

	if (!qp)

		return ERR_PTR(-ENOMEM);



	for (i = 0; i < 4; i++)

		qp->happy_meals[i] = NULL;
@@ -2592,7 +2594,6 @@ static struct quattro *quattro_pci_find(struct pci_dev *pdev) 


	/* No range tricks necessary on PCI. */

	qp->nranges = 0;

	}

	return qp;

}

#endif /* CONFIG_PCI */
@@ -2948,11 +2949,15 @@ static int happy_meal_pci_probe(struct pci_dev *pdev, 


	if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) {

		qp = quattro_pci_find(pdev);

		if (qp == NULL)

		if (IS_ERR(qp)) {

			err = PTR_ERR(qp);

			goto err_out;

		}



		for (qfe_slot = 0; qfe_slot < 4; qfe_slot++)

			if (qp->happy_meals[qfe_slot] == NULL)

			if (!qp->happy_meals[qfe_slot])

				break;



		if (qfe_slot == 4)

			goto err_out;

	}