diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2016-07-05 07:56:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-05 10:20:56 -0700 |
| commit | 96329a181bfbbac573ce988d7439369c5ade9249 (patch) | |
| tree | 8feaacd4a0bc8be196afec35f85d00f7bac2073d /drivers/net/ethernet/hisilicon | |
| parent | 684a95c064fc63e48c9936fe3d9dfd5ed1ea3b95 (diff) | |
net: hns: fix return value check in hns_dsaf_get_cfg()
In case of error, function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c index 86ce28aa11d0..2ef4277d00b3 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c @@ -114,9 +114,9 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) dsaf_dev->sc_base = devm_ioremap_resource(&pdev->dev, res); - if (!dsaf_dev->sc_base) { + if (IS_ERR(dsaf_dev->sc_base)) { dev_err(dsaf_dev->dev, "subctrl can not map!\n"); - return -ENOMEM; + return PTR_ERR(dsaf_dev->sc_base); } res = platform_get_resource(pdev, IORESOURCE_MEM, @@ -128,9 +128,9 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) dsaf_dev->sds_base = devm_ioremap_resource(&pdev->dev, res); - if (!dsaf_dev->sds_base) { + if (IS_ERR(dsaf_dev->sds_base)) { dev_err(dsaf_dev->dev, "serdes-ctrl can not map!\n"); - return -ENOMEM; + return PTR_ERR(dsaf_dev->sds_base); } } else { dsaf_dev->sub_ctrl = syscon; @@ -146,9 +146,9 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) } } dsaf_dev->ppe_base = devm_ioremap_resource(&pdev->dev, res); - if (!dsaf_dev->ppe_base) { + if (IS_ERR(dsaf_dev->ppe_base)) { dev_err(dsaf_dev->dev, "ppe-base resource can not map!\n"); - return -ENOMEM; + return PTR_ERR(dsaf_dev->ppe_base); } dsaf_dev->ppe_paddr = res->start; @@ -165,9 +165,9 @@ int hns_dsaf_get_cfg(struct dsaf_device *dsaf_dev) } } dsaf_dev->io_base = devm_ioremap_resource(&pdev->dev, res); - if (!dsaf_dev->io_base) { + if (IS_ERR(dsaf_dev->io_base)) { dev_err(dsaf_dev->dev, "dsaf-base resource can not map!\n"); - return -ENOMEM; + return PTR_ERR(dsaf_dev->io_base); } } |