Skip to content

Commit

Permalink
Bluetooth: mgmt: Use more consistent error variable names
Browse files Browse the repository at this point in the history
For simple integer errors the variable name "err" is more consistent
with the existing code base than "ret".

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Johan Hedberg committed Feb 17, 2012
1 parent 76a7f3a commit 7bb895d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2585,7 +2585,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
{
struct cmd_lookup match = { NULL, hdev };
__le32 ev;
int ret;
int err;

mgmt_pending_foreach(MGMT_OP_SET_POWERED, hdev, settings_rsp, &match);

Expand All @@ -2596,50 +2596,50 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)

ev = cpu_to_le32(get_current_settings(hdev));

ret = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
match.sk);

if (match.sk)
sock_put(match.sk);

return ret;
return err;
}

int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
{
struct cmd_lookup match = { NULL, hdev };
__le32 ev;
int ret;
int err;

mgmt_pending_foreach(MGMT_OP_SET_DISCOVERABLE, hdev, settings_rsp, &match);

ev = cpu_to_le32(get_current_settings(hdev));

ret = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
match.sk);
if (match.sk)
sock_put(match.sk);

return ret;
return err;
}

int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
{
__le32 ev;
struct cmd_lookup match = { NULL, hdev };
int ret;
int err;

mgmt_pending_foreach(MGMT_OP_SET_CONNECTABLE, hdev, settings_rsp,
&match);

ev = cpu_to_le32(get_current_settings(hdev));

ret = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);

if (match.sk)
sock_put(match.sk);

return ret;
return err;
}

int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status)
Expand Down

0 comments on commit 7bb895d

Please sign in to comment.