Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f10b277 authored by Huazhong Tan's avatar Huazhong Tan Committed by Greg Kroah-Hartman
Browse files

net: hns3: change hnae3_register_ae_dev() to int 



[ Upstream commit 74354140a579008fd164241e3697d9c37e5b8989 ]

hnae3_register_ae_dev() may fail, and it should return a error code
to its caller, so change hnae3_register_ae_dev() return type to int.

Also, when hnae3_register_ae_dev() return error, hns3_probe() should
do some error handling and return the error code.

Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4f6f6ba6

drivers/net/ethernet/hisilicon/hns3/hnae3.c

+9 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ EXPORT_SYMBOL(hnae3_unregister_ae_algo); 
 * @ae_dev: the AE device

 * NOTE: the duplicated name will not be checked

 */

void hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev)

int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev)

{

	const struct pci_device_id *id;

	struct hnae3_ae_algo *ae_algo;
@@ -260,6 +260,7 @@ void hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 


		if (!ae_dev->ops) {

			dev_err(&ae_dev->pdev->dev, "ae_dev ops are null\n");

			ret = -EOPNOTSUPP;

			goto out_err;

		}
@@ -286,8 +287,15 @@ void hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev) 
				ret);

	}



	mutex_unlock(&hnae3_common_lock);



	return 0;



out_err:

	list_del(&ae_dev->node);

	mutex_unlock(&hnae3_common_lock);



	return ret;

}

EXPORT_SYMBOL(hnae3_register_ae_dev);

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ struct hnae3_handle { 
#define hnae3_get_bit(origin, shift) \

	hnae3_get_field((origin), (0x1 << (shift)), (shift))



void hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev);

int hnae3_register_ae_dev(struct hnae3_ae_dev *ae_dev);

void hnae3_unregister_ae_dev(struct hnae3_ae_dev *ae_dev);



void hnae3_unregister_ae_algo(struct hnae3_ae_algo *ae_algo);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+6 −2
Original line number Diff line number Diff line
@@ -1604,9 +1604,13 @@ static int hns3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	ae_dev->dev_type = HNAE3_DEV_KNIC;

	pci_set_drvdata(pdev, ae_dev);



	hnae3_register_ae_dev(ae_dev);

	ret = hnae3_register_ae_dev(ae_dev);

	if (ret) {

		devm_kfree(&pdev->dev, ae_dev);

		pci_set_drvdata(pdev, NULL);

	}



	return 0;

	return ret;

}



/* hns3_remove - Device removal routine