Commit 96a19319 authored by wengjianfeng's avatar wengjianfeng Committed by David S. Miller

NFC: nxp-nci: remove unnecessary labels

Simplify the code by removing unnecessary labels and returning directly.
Signed-off-by: default avatarwengjianfeng <wengjianfeng@yulong.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e44dc724
...@@ -70,21 +70,16 @@ static int nxp_nci_send(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -70,21 +70,16 @@ static int nxp_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
struct nxp_nci_info *info = nci_get_drvdata(ndev); struct nxp_nci_info *info = nci_get_drvdata(ndev);
int r; int r;
if (!info->phy_ops->write) { if (!info->phy_ops->write)
r = -ENOTSUPP; return -EOPNOTSUPP;
goto send_exit;
}
if (info->mode != NXP_NCI_MODE_NCI) { if (info->mode != NXP_NCI_MODE_NCI)
r = -EINVAL; return -EINVAL;
goto send_exit;
}
r = info->phy_ops->write(info->phy_id, skb); r = info->phy_ops->write(info->phy_id, skb);
if (r < 0) if (r < 0)
kfree_skb(skb); kfree_skb(skb);
send_exit:
return r; return r;
} }
...@@ -104,10 +99,8 @@ int nxp_nci_probe(void *phy_id, struct device *pdev, ...@@ -104,10 +99,8 @@ int nxp_nci_probe(void *phy_id, struct device *pdev,
int r; int r;
info = devm_kzalloc(pdev, sizeof(struct nxp_nci_info), GFP_KERNEL); info = devm_kzalloc(pdev, sizeof(struct nxp_nci_info), GFP_KERNEL);
if (!info) { if (!info)
r = -ENOMEM; return -ENOMEM;
goto probe_exit;
}
info->phy_id = phy_id; info->phy_id = phy_id;
info->pdev = pdev; info->pdev = pdev;
...@@ -120,31 +113,25 @@ int nxp_nci_probe(void *phy_id, struct device *pdev, ...@@ -120,31 +113,25 @@ int nxp_nci_probe(void *phy_id, struct device *pdev,
if (info->phy_ops->set_mode) { if (info->phy_ops->set_mode) {
r = info->phy_ops->set_mode(info->phy_id, NXP_NCI_MODE_COLD); r = info->phy_ops->set_mode(info->phy_id, NXP_NCI_MODE_COLD);
if (r < 0) if (r < 0)
goto probe_exit; return r;
} }
info->mode = NXP_NCI_MODE_COLD; info->mode = NXP_NCI_MODE_COLD;
info->ndev = nci_allocate_device(&nxp_nci_ops, NXP_NCI_NFC_PROTOCOLS, info->ndev = nci_allocate_device(&nxp_nci_ops, NXP_NCI_NFC_PROTOCOLS,
NXP_NCI_HDR_LEN, 0); NXP_NCI_HDR_LEN, 0);
if (!info->ndev) { if (!info->ndev)
r = -ENOMEM; return -ENOMEM;
goto probe_exit;
}
nci_set_parent_dev(info->ndev, pdev); nci_set_parent_dev(info->ndev, pdev);
nci_set_drvdata(info->ndev, info); nci_set_drvdata(info->ndev, info);
r = nci_register_device(info->ndev); r = nci_register_device(info->ndev);
if (r < 0) if (r < 0) {
goto probe_exit_free_nci; nci_free_device(info->ndev);
return r;
}
*ndev = info->ndev; *ndev = info->ndev;
goto probe_exit;
probe_exit_free_nci:
nci_free_device(info->ndev);
probe_exit:
return r; return r;
} }
EXPORT_SYMBOL(nxp_nci_probe); EXPORT_SYMBOL(nxp_nci_probe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment