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

Commit f6c2df1e authored by Qianqian Xie's avatar Qianqian Xie Committed by David S. Miller
Browse files

net: hns: Remove unnecessary device resource free 



The driver uses devm_ioremap_resource, it will unmap the map
automatically, remove the unnecessary the resource free.

Signed-off-by: default avatarQianqian Xie <xieqianqian@huawei.com>
Reported-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7211729

drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c

+4 −35
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) 
	    desc_num > HNS_DSAF_MAX_DESC_CNT) {

		dev_err(dsaf_dev->dev, "get desc-num(%d) fail, ret=%d!\n",

			desc_num, ret);

		goto unmap_base_addr;

		return -EINVAL;

	}

	dsaf_dev->desc_num = desc_num;
@@ -192,7 +192,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) 
	if (ret < 0) {

		dev_err(dsaf_dev->dev,

			"get buf-size fail, ret=%d!\r\n", ret);

		goto unmap_base_addr;

		return ret;

	}

	dsaf_dev->buf_size = buf_size;
@@ -200,7 +200,7 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) 
	if (dsaf_dev->buf_size_type < 0) {

		dev_err(dsaf_dev->dev,

			"buf_size(%d) is wrong!\n", buf_size);

		goto unmap_base_addr;

		return -EINVAL;

	}



	dsaf_dev->misc_op = hns_misc_op_get(dsaf_dev);
@@ -213,32 +213,6 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) 
		dev_err(dsaf_dev->dev, "set mask to 64bit fail!\n");



	return 0;



unmap_base_addr:

	if (dsaf_dev->io_base)

		iounmap(dsaf_dev->io_base);

	if (dsaf_dev->ppe_base)

		iounmap(dsaf_dev->ppe_base);

	if (dsaf_dev->sds_base)

		iounmap(dsaf_dev->sds_base);

	if (dsaf_dev->sc_base)

		iounmap(dsaf_dev->sc_base);

	return ret;

}



static void hns_dsaf_free_cfg(struct dsaf_device *dsaf_dev)

{

	if (dsaf_dev->io_base)

		iounmap(dsaf_dev->io_base);



	if (dsaf_dev->ppe_base)

		iounmap(dsaf_dev->ppe_base);



	if (dsaf_dev->sds_base)

		iounmap(dsaf_dev->sds_base);



	if (dsaf_dev->sc_base)

		iounmap(dsaf_dev->sc_base);

}



/**
@@ -2645,7 +2619,7 @@ static int hns_dsaf_probe(struct platform_device *pdev) 


	ret = hns_dsaf_init(dsaf_dev);

	if (ret)

		goto free_cfg;

		goto free_dev;



	ret = hns_mac_init(dsaf_dev);

	if (ret)
@@ -2670,9 +2644,6 @@ static int hns_dsaf_probe(struct platform_device *pdev) 
uninit_dsaf:

	hns_dsaf_free(dsaf_dev);



free_cfg:

	hns_dsaf_free_cfg(dsaf_dev);



free_dev:

	hns_dsaf_free_dev(dsaf_dev);
@@ -2695,8 +2666,6 @@ static int hns_dsaf_remove(struct platform_device *pdev) 


	hns_dsaf_free(dsaf_dev);



	hns_dsaf_free_cfg(dsaf_dev);



	hns_dsaf_free_dev(dsaf_dev);



	return 0;