Skip to content

Commit

Permalink
NFC: HCI: Follow a positive code path in the HCI ops implementations
Browse files Browse the repository at this point in the history
Exiting on the error case is more typical to the kernel coding style.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Samuel Ortiz committed Jun 13, 2013
1 parent 9a695d2 commit a395298
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions net/nfc/hci/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

if (hdev->ops->dep_link_up)
return hdev->ops->dep_link_up(hdev, target, comm_mode,
gb, gb_len);
if (!hdev->ops->dep_link_up)
return 0;

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)
{
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);

if (hdev->ops->dep_link_down)
return hdev->ops->dep_link_down(hdev);
if (!hdev->ops->dep_link_down)
return 0;

return 0;
return hdev->ops->dep_link_down(hdev);
}

static int hci_activate_target(struct nfc_dev *nfc_dev,
Expand Down Expand Up @@ -673,23 +673,23 @@ static int hci_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
{
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);

if (hdev->ops->tm_send)
return hdev->ops->tm_send(hdev, skb);

kfree_skb(skb);
if (!hdev->ops->tm_send) {
kfree_skb(skb);
return -ENOTSUPP;
}

return -ENOTSUPP;
return hdev->ops->tm_send(hdev, skb);
}

static int hci_check_presence(struct nfc_dev *nfc_dev,
struct nfc_target *target)
{
struct nfc_hci_dev *hdev = nfc_get_drvdata(nfc_dev);

if (hdev->ops->check_presence)
return hdev->ops->check_presence(hdev, target);
if (!hdev->ops->check_presence)
return 0;

return 0;
return hdev->ops->check_presence(hdev, target);
}

static void nfc_hci_failure(struct nfc_hci_dev *hdev, int err)
Expand Down Expand Up @@ -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);

if (hdev->ops->fw_upload)
return hdev->ops->fw_upload(hdev, firmware_name);
if (!hdev->ops->fw_upload)
return -ENOTSUPP;

return -ENOTSUPP;
return hdev->ops->fw_upload(hdev, firmware_name);
}

static struct nfc_ops hci_nfc_ops = {
Expand Down

0 comments on commit a395298

Please sign in to comment.