Commit 657cc646 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Remove usage of BT_ERR_RATELIMITED macro 



The macro is really not needed and can be replaced with either usage of
bt_err_ratelimited or bt_dev_err_ratelimited.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 36278a5d

include/net/bluetooth/bluetooth.h

+1 −3
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ void bt_err_ratelimited(const char *fmt, ...); 
#define BT_ERR(fmt, ...)	bt_err(fmt "\n", ##__VA_ARGS__)

#define BT_DBG(fmt, ...)	pr_debug(fmt "\n", ##__VA_ARGS__)



#define BT_ERR_RATELIMITED(fmt, ...) bt_err_ratelimited(fmt "\n", ##__VA_ARGS__)



#define bt_dev_info(hdev, fmt, ...)				\

	BT_INFO("%s: " fmt, (hdev)->name, ##__VA_ARGS__)

#define bt_dev_warn(hdev, fmt, ...)				\
@@ -152,7 +150,7 @@ void bt_err_ratelimited(const char *fmt, ...); 
#define bt_dev_warn_ratelimited(hdev, fmt, ...)			\

	bt_warn_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__)

#define bt_dev_err_ratelimited(hdev, fmt, ...)			\

	BT_ERR_RATELIMITED("%s: " fmt, (hdev)->name, ##__VA_ARGS__)

	bt_err_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__)



/* Connection and socket states */

enum {

net/bluetooth/hci_event.c

+6 −8
Original line number Diff line number Diff line
@@ -5451,7 +5451,7 @@ static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	hci_dev_unlock(hdev);

}



static u8 ext_evt_type_to_legacy(u16 evt_type)

static u8 ext_evt_type_to_legacy(struct hci_dev *hdev, u16 evt_type)

{

	if (evt_type & LE_EXT_ADV_LEGACY_PDU) {

		switch (evt_type) {
@@ -5468,10 +5468,7 @@ static u8 ext_evt_type_to_legacy(u16 evt_type) 
			return LE_ADV_SCAN_RSP;

		}



		BT_ERR_RATELIMITED("Unknown advertising packet type: 0x%02x",

				   evt_type);



		return LE_ADV_INVALID;

		goto invalid;

	}



	if (evt_type & LE_EXT_ADV_CONN_IND) {
@@ -5491,7 +5488,8 @@ static u8 ext_evt_type_to_legacy(u16 evt_type) 
	    evt_type & LE_EXT_ADV_DIRECT_IND)

		return LE_ADV_NONCONN_IND;



	BT_ERR_RATELIMITED("Unknown advertising packet type: 0x%02x",

invalid:

	bt_dev_err_ratelimited(hdev, "Unknown advertising packet type: 0x%02x",

			       evt_type);



	return LE_ADV_INVALID;
@@ -5510,7 +5508,7 @@ static void hci_le_ext_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		u16 evt_type;



		evt_type = __le16_to_cpu(ev->evt_type);

		legacy_evt_type = ext_evt_type_to_legacy(evt_type);

		legacy_evt_type = ext_evt_type_to_legacy(hdev, evt_type);

		if (legacy_evt_type != LE_ADV_INVALID) {

			process_adv_report(hdev, legacy_evt_type, &ev->bdaddr,

					   ev->bdaddr_type, NULL, 0, ev->rssi,

CRA Git | Maintained and supported by SUSTech CRA and CCSE