Commit 807deac2 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Johan Hedberg
Browse files

Bluetooth: Fix coding style in hci_event.c 



Follow the net subsystem rules.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b80f021f

net/bluetooth/hci_event.c

+135 −104
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) 
	hci_conn_check_pending(hdev);

}



static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev, struct sk_buff *skb)

static void hci_cc_remote_name_req_cancel(struct hci_dev *hdev,

					  struct sk_buff *skb)

{

	BT_DBG("%s", hdev->name);

}
@@ -166,7 +167,8 @@ static void hci_cc_write_link_policy(struct hci_dev *hdev, struct sk_buff *skb) 
	hci_dev_unlock(hdev);

}



static void hci_cc_read_def_link_policy(struct hci_dev *hdev, struct sk_buff *skb)

static void hci_cc_read_def_link_policy(struct hci_dev *hdev,

					struct sk_buff *skb)

{

	struct hci_rp_read_def_link_policy *rp = (void *) skb->data;
@@ -178,7 +180,8 @@ static void hci_cc_read_def_link_policy(struct hci_dev *hdev, struct sk_buff *sk 
	hdev->link_policy = __le16_to_cpu(rp->policy);

}



static void hci_cc_write_def_link_policy(struct hci_dev *hdev, struct sk_buff *skb)

static void hci_cc_write_def_link_policy(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	__u8 status = *((__u8 *) skb->data);

	void *sent;
@@ -618,8 +621,7 @@ static void hci_cc_read_local_version(struct hci_dev *hdev, struct sk_buff *skb) 
	hdev->lmp_subver = __le16_to_cpu(rp->lmp_subver);



	BT_DBG("%s manufacturer %d hci ver %d:%d", hdev->name,

					hdev->manufacturer,

					hdev->hci_ver, hdev->hci_rev);

	       hdev->manufacturer, hdev->hci_ver, hdev->hci_rev);



	if (test_bit(HCI_INIT, &hdev->flags))

		hci_setup(hdev);
@@ -798,9 +800,8 @@ static void hci_cc_read_buffer_size(struct hci_dev *hdev, struct sk_buff *skb) 
	hdev->acl_cnt = hdev->acl_pkts;

	hdev->sco_cnt = hdev->sco_pkts;



	BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev->name,

					hdev->acl_mtu, hdev->acl_pkts,

					hdev->sco_mtu, hdev->sco_pkts);

	BT_DBG("%s acl mtu %d:%d sco mtu %d:%d", hdev->name, hdev->acl_mtu,

	       hdev->acl_pkts, hdev->sco_mtu, hdev->sco_pkts);

}



static void hci_cc_read_bd_addr(struct hci_dev *hdev, struct sk_buff *skb)
@@ -1343,9 +1344,8 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev, 


	/* Only request authentication for SSP connections or non-SSP

	 * devices with sec_level HIGH or if MITM protection is requested */

	if (!hci_conn_ssp_enabled(conn) &&

				conn->pending_sec_level != BT_SECURITY_HIGH &&

				!(conn->auth_type & 0x01))

	if (!hci_conn_ssp_enabled(conn) && !(conn->auth_type & 0x01) &&

	    conn->pending_sec_level != BT_SECURITY_HIGH)

		return 0;



	return 1;
@@ -1668,7 +1668,8 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status) 
	BT_DBG("%s status 0x%x", hdev->name, status);

}



static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_inquiry_complete_evt(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

	__u8 status = *((__u8 *) skb->data);

	struct discovery_state *discov = &hdev->discovery;
@@ -1708,7 +1709,8 @@ static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_inquiry_result_evt(struct hci_dev *hdev,

					  struct sk_buff *skb)

{

	struct inquiry_data data;

	struct inquiry_info *info = (void *) (skb->data + 1);
@@ -1745,7 +1747,8 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff * 
	hci_dev_unlock(hdev);

}



static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_conn_complete_evt(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	struct hci_ev_conn_complete *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -1823,13 +1826,14 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *s 
	hci_conn_check_pending(hdev);

}



static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_conn_request_evt(struct hci_dev *hdev,

					struct sk_buff *skb)

{

	struct hci_ev_conn_request *ev = (void *) skb->data;

	int mask = hdev->link_mode;



	BT_DBG("%s bdaddr %s type 0x%x", hdev->name,

					batostr(&ev->bdaddr), ev->link_type);

	BT_DBG("%s bdaddr %s type 0x%x", hdev->name, batostr(&ev->bdaddr),

	       ev->link_type);



	mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);
@@ -1897,7 +1901,8 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk 
	}

}



static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_disconn_complete_evt(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

	struct hci_ev_disconn_complete *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -1934,7 +1939,8 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_auth_complete_evt(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	struct hci_ev_auth_complete *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2039,7 +2045,8 @@ static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb 
	hci_dev_unlock(hdev);

}



static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_encrypt_change_evt(struct hci_dev *hdev,

					  struct sk_buff *skb)

{

	struct hci_ev_encrypt_change *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2082,7 +2089,8 @@ static inline void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff * 
	hci_dev_unlock(hdev);

}



static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev,

						    struct sk_buff *skb)

{

	struct hci_ev_change_link_key_complete *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2104,7 +2112,8 @@ static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, struct 
	hci_dev_unlock(hdev);

}



static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_remote_features_evt(struct hci_dev *hdev,

					   struct sk_buff *skb)

{

	struct hci_ev_remote_features *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2153,17 +2162,20 @@ static inline void hci_remote_features_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_remote_version_evt(struct hci_dev *hdev,

					  struct sk_buff *skb)

{

	BT_DBG("%s", hdev->name);

}



static inline void hci_qos_setup_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_qos_setup_complete_evt(struct hci_dev *hdev,

					      struct sk_buff *skb)

{

	BT_DBG("%s", hdev->name);

}



static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_cmd_complete_evt(struct hci_dev *hdev,

					struct sk_buff *skb)

{

	struct hci_ev_cmd_complete *ev = (void *) skb->data;

	__u16 opcode;
@@ -2465,7 +2477,8 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	}

}



static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_role_change_evt(struct hci_dev *hdev,

				       struct sk_buff *skb)

{

	struct hci_ev_role_change *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2491,7 +2504,8 @@ static inline void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb 
	hci_dev_unlock(hdev);

}



static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	struct hci_ev_num_comp_pkts *ev = (void *) skb->data;

	int i;
@@ -2607,7 +2621,8 @@ static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev, 
	queue_work(hdev->workqueue, &hdev->tx_work);

}



static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_mode_change_evt(struct hci_dev *hdev,

				       struct sk_buff *skb)

{

	struct hci_ev_mode_change *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2635,7 +2650,8 @@ static inline void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb 
	hci_dev_unlock(hdev);

}



static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_pin_code_request_evt(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

	struct hci_ev_pin_code_req *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2672,7 +2688,8 @@ static inline void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_link_key_request_evt(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

	struct hci_ev_link_key_req *ev = (void *) skb->data;

	struct hci_cp_link_key_reply cp;
@@ -2705,8 +2722,7 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff 
	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);

	if (conn) {

		if (key->type == HCI_LK_UNAUTH_COMBINATION &&

				conn->auth_type != 0xff &&

				(conn->auth_type & 0x01)) {

		    conn->auth_type != 0xff && (conn->auth_type & 0x01)) {

			BT_DBG("%s ignoring unauthenticated key", hdev->name);

			goto not_found;

		}
@@ -2736,7 +2752,8 @@ static inline void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_link_key_notify_evt(struct hci_dev *hdev,

					   struct sk_buff *skb)

{

	struct hci_ev_link_key_notify *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2765,7 +2782,8 @@ static inline void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_clock_offset_evt(struct hci_dev *hdev,

					struct sk_buff *skb)

{

	struct hci_ev_clock_offset *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2788,7 +2806,8 @@ static inline void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *sk 
	hci_dev_unlock(hdev);

}



static inline void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_pkt_type_change_evt(struct hci_dev *hdev,

					   struct sk_buff *skb)

{

	struct hci_ev_pkt_type_change *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2804,7 +2823,8 @@ static inline void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev,

					  struct sk_buff *skb)

{

	struct hci_ev_pscan_rep_mode *ev = (void *) skb->data;

	struct inquiry_entry *ie;
@@ -2822,7 +2842,8 @@ static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff * 
	hci_dev_unlock(hdev);

}



static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,

						    struct sk_buff *skb)

{

	struct inquiry_data data;

	int num_rsp = *((__u8 *) skb->data);
@@ -2881,7 +2902,8 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct 
	hci_dev_unlock(hdev);

}



static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_remote_ext_features_evt(struct hci_dev *hdev,

					       struct sk_buff *skb)

{

	struct hci_ev_remote_ext_features *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2929,7 +2951,8 @@ static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, struct sk_b 
	hci_dev_unlock(hdev);

}



static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev,

					      struct sk_buff *skb)

{

	struct hci_ev_sync_conn_complete *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -2984,19 +3007,22 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu 
	hci_dev_unlock(hdev);

}



static inline void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_sync_conn_changed_evt(struct hci_dev *hdev,

					     struct sk_buff *skb)

{

	BT_DBG("%s", hdev->name);

}



static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_sniff_subrate_evt(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	struct hci_ev_sniff_subrate *ev = (void *) skb->data;



	BT_DBG("%s status %d", hdev->name, ev->status);

}



static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev,

						   struct sk_buff *skb)

{

	struct inquiry_data data;

	struct extended_inquiry_info *info = (void *) (skb->data + 1);
@@ -3062,7 +3088,8 @@ static inline u8 hci_get_auth_req(struct hci_conn *conn) 
	return conn->auth_type;

}



static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_io_capa_request_evt(struct hci_dev *hdev,

					   struct sk_buff *skb)

{

	struct hci_ev_io_capa_request *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -3114,7 +3141,8 @@ static inline void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff 
	hci_dev_unlock(hdev);

}



static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_io_capa_reply_evt(struct hci_dev *hdev,

					 struct sk_buff *skb)

{

	struct hci_ev_io_capa_reply *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -3219,7 +3247,8 @@ static inline void hci_user_passkey_request_evt(struct hci_dev *hdev, 
	hci_dev_unlock(hdev);

}



static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev,

						struct sk_buff *skb)

{

	struct hci_ev_simple_pair_complete *ev = (void *) skb->data;

	struct hci_conn *conn;
@@ -3247,7 +3276,8 @@ static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, struct sk_ 
	hci_dev_unlock(hdev);

}



static inline void hci_remote_host_features_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_remote_host_features_evt(struct hci_dev *hdev,

						struct sk_buff *skb)

{

	struct hci_ev_remote_host_features *ev = (void *) skb->data;

	struct inquiry_entry *ie;
@@ -3298,7 +3328,8 @@ static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev, 
	hci_dev_unlock(hdev);

}



static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)

static inline void hci_le_conn_complete_evt(struct hci_dev *hdev,

					    struct sk_buff *skb)

{

	struct hci_ev_le_conn_complete *ev = (void *) skb->data;

	struct hci_conn *conn;