OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFC: HCI: Follow a positive code path in the HCI ops implementations 

Exiting on the error case is more typical to the kernel coding style.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2013-05-25 01:21:21 +02:00
parent 9a695d23aa
commit a395298c9c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/nfc/hci/core.c
View File

@ -570,21 +570,21 @@ static int hci_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
{ {
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev); struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
if (hdev->ops->dep_link_up) if (!hdev->ops->dep_link_up)
return hdev->ops->dep_link_up(hdev, target, comm_mode, return 0;
gb, gb_len);
return 0; return hdev->ops->dep_link_up(hdev, target, comm_mode,
gb, gb_len);
} }
static int hci_dep_link_down(struct nfc_dev *nfc_dev) static int hci_dep_link_down(struct nfc_dev *nfc_dev)
{ {
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev); struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
if (hdev->ops->dep_link_down) if (!hdev->ops->dep_link_down)
return hdev->ops->dep_link_down(hdev); return 0;
return 0; return hdev->ops->dep_link_down(hdev);
} }
static int hci_activate_target(struct nfc_dev *nfc_dev, static int hci_activate_target(struct nfc_dev *nfc_dev,
@ -673,12 +673,12 @@ static int hci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
{ {
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev); struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
if (hdev->ops->tm_send) if (!hdev->ops->tm_send) {
return hdev->ops->tm_send(hdev, skb); kfree_skb(skb);
return -ENOTSUPP;
}
kfree_skb(skb); return hdev->ops->tm_send(hdev, skb);
return -ENOTSUPP;
} }
static int hci_check_presence(struct nfc_dev *nfc_dev, static int hci_check_presence(struct nfc_dev *nfc_dev,
@ -686,10 +686,10 @@ static int hci_check_presence(struct nfc_dev *nfc_dev,
{ {
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev); struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
if (hdev->ops->check_presence) if (!hdev->ops->check_presence)
return hdev->ops->check_presence(hdev, target); return 0;
return 0; return hdev->ops->check_presence(hdev, target);
} }
static void nfc_hci_failure(struct nfc_hci_dev *hdev, int err) static void nfc_hci_failure(struct nfc_hci_dev *hdev, int err)
@ -783,10 +783,10 @@ static int hci_fw_upload(struct nfc_dev *nfc_dev, const char *firmware_name)
{ {
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev); struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);
if (hdev->ops->fw_upload) if (!hdev->ops->fw_upload)
return hdev->ops->fw_upload(hdev, firmware_name); return -ENOTSUPP;
return -ENOTSUPP; return hdev->ops->fw_upload(hdev, firmware_name);
} }
static struct nfc_ops hci_nfc_ops = { static struct nfc_ops hci_nfc_ops = {