Skip to content

Commit 0d8603b

Browse files
tedd-anholtmann
tedd-an
authored and
holtmann
committed
Bluetooth: btintel: Clean the exported function to static
This patch changes the exported functions to static if they are no longer used by others. Signed-off-by: Tedd Ho-Jeong An <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent 3df4dfb commit 0d8603b

File tree

2 files changed

+31
-92
lines changed

2 files changed

+31
-92
lines changed

‎drivers/bluetooth/btintel.c

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,26 @@ int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
131131
}
132132
EXPORT_SYMBOL_GPL(btintel_set_bdaddr);
133133

134+
static int btintel_set_event_mask(struct hci_dev *hdev, bool debug)
135+
{
136+
u8 mask[8] = { 0x87, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
137+
struct sk_buff *skb;
138+
int err;
139+
140+
if (debug)
141+
mask[1] |= 0x62;
142+
143+
skb = __hci_cmd_sync(hdev, 0xfc52, 8, mask, HCI_INIT_TIMEOUT);
144+
if (IS_ERR(skb)) {
145+
err = PTR_ERR(skb);
146+
bt_dev_err(hdev, "Setting Intel event mask failed (%d)", err);
147+
return err;
148+
}
149+
kfree_skb(skb);
150+
151+
return 0;
152+
}
153+
134154
int btintel_set_diag(struct hci_dev *hdev, bool enable)
135155
{
136156
struct sk_buff *skb;
@@ -198,7 +218,7 @@ static int btintel_set_diag_combined(struct hci_dev *hdev, bool enable)
198218
return ret;
199219
}
200220

201-
void btintel_hw_error(struct hci_dev *hdev, u8 code)
221+
static void btintel_hw_error(struct hci_dev *hdev, u8 code)
202222
{
203223
struct sk_buff *skb;
204224
u8 type = 0x00;
@@ -230,7 +250,6 @@ void btintel_hw_error(struct hci_dev *hdev, u8 code)
230250

231251
kfree_skb(skb);
232252
}
233-
EXPORT_SYMBOL_GPL(btintel_hw_error);
234253

235254
int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver)
236255
{
@@ -294,8 +313,8 @@ int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver)
294313
}
295314
EXPORT_SYMBOL_GPL(btintel_version_info);
296315

297-
int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen,
298-
const void *param)
316+
static int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen,
317+
const void *param)
299318
{
300319
while (plen > 0) {
301320
struct sk_buff *skb;
@@ -317,7 +336,6 @@ int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen,
317336

318337
return 0;
319338
}
320-
EXPORT_SYMBOL_GPL(btintel_secure_send);
321339

322340
int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name)
323341
{
@@ -364,27 +382,6 @@ int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name)
364382
}
365383
EXPORT_SYMBOL_GPL(btintel_load_ddc_config);
366384

367-
int btintel_set_event_mask(struct hci_dev *hdev, bool debug)
368-
{
369-
u8 mask[8] = { 0x87, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
370-
struct sk_buff *skb;
371-
int err;
372-
373-
if (debug)
374-
mask[1] |= 0x62;
375-
376-
skb = __hci_cmd_sync(hdev, 0xfc52, 8, mask, HCI_INIT_TIMEOUT);
377-
if (IS_ERR(skb)) {
378-
err = PTR_ERR(skb);
379-
bt_dev_err(hdev, "Setting Intel event mask failed (%d)", err);
380-
return err;
381-
}
382-
kfree_skb(skb);
383-
384-
return 0;
385-
}
386-
EXPORT_SYMBOL_GPL(btintel_set_event_mask);
387-
388385
int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug)
389386
{
390387
int err, ret;
@@ -428,7 +425,8 @@ int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver)
428425
}
429426
EXPORT_SYMBOL_GPL(btintel_read_version);
430427

431-
int btintel_version_info_tlv(struct hci_dev *hdev, struct intel_version_tlv *version)
428+
static int btintel_version_info_tlv(struct hci_dev *hdev,
429+
struct intel_version_tlv *version)
432430
{
433431
const char *variant;
434432

@@ -505,7 +503,6 @@ int btintel_version_info_tlv(struct hci_dev *hdev, struct intel_version_tlv *ver
505503

506504
return 0;
507505
}
508-
EXPORT_SYMBOL_GPL(btintel_version_info_tlv);
509506

510507
static int btintel_parse_version_tlv(struct hci_dev *hdev,
511508
struct intel_version_tlv *version,
@@ -609,7 +606,8 @@ static int btintel_parse_version_tlv(struct hci_dev *hdev,
609606
return 0;
610607
}
611608

612-
int btintel_read_version_tlv(struct hci_dev *hdev, struct intel_version_tlv *version)
609+
static int btintel_read_version_tlv(struct hci_dev *hdev,
610+
struct intel_version_tlv *version)
613611
{
614612
struct sk_buff *skb;
615613
const u8 param[1] = { 0xFF };
@@ -636,7 +634,6 @@ int btintel_read_version_tlv(struct hci_dev *hdev, struct intel_version_tlv *ver
636634
kfree_skb(skb);
637635
return 0;
638636
}
639-
EXPORT_SYMBOL_GPL(btintel_read_version_tlv);
640637

641638
/* ------- REGMAP IBT SUPPORT ------- */
642639

@@ -1210,7 +1207,7 @@ static int btintel_download_fw_tlv(struct hci_dev *hdev,
12101207
return 0;
12111208
}
12121209

1213-
void btintel_reset_to_bootloader(struct hci_dev *hdev)
1210+
static void btintel_reset_to_bootloader(struct hci_dev *hdev)
12141211
{
12151212
struct intel_reset params;
12161213
struct sk_buff *skb;
@@ -1253,10 +1250,9 @@ void btintel_reset_to_bootloader(struct hci_dev *hdev)
12531250
*/
12541251
msleep(150);
12551252
}
1256-
EXPORT_SYMBOL_GPL(btintel_reset_to_bootloader);
12571253

1258-
int btintel_read_debug_features(struct hci_dev *hdev,
1259-
struct intel_debug_features *features)
1254+
static int btintel_read_debug_features(struct hci_dev *hdev,
1255+
struct intel_debug_features *features)
12601256
{
12611257
struct sk_buff *skb;
12621258
u8 page_no = 1;
@@ -1285,9 +1281,8 @@ int btintel_read_debug_features(struct hci_dev *hdev,
12851281
kfree_skb(skb);
12861282
return 0;
12871283
}
1288-
EXPORT_SYMBOL_GPL(btintel_read_debug_features);
12891284

1290-
int btintel_set_debug_features(struct hci_dev *hdev,
1285+
static int btintel_set_debug_features(struct hci_dev *hdev,
12911286
const struct intel_debug_features *features)
12921287
{
12931288
u8 mask[11] = { 0x0a, 0x92, 0x02, 0x07, 0x00, 0x00, 0x00, 0x00,
@@ -1312,7 +1307,6 @@ int btintel_set_debug_features(struct hci_dev *hdev,
13121307
kfree_skb(skb);
13131308
return 0;
13141309
}
1315-
EXPORT_SYMBOL_GPL(btintel_set_debug_features);
13161310

13171311
static const struct firmware *btintel_legacy_rom_get_fw(struct hci_dev *hdev,
13181312
struct intel_version *ver)

‎drivers/bluetooth/btintel.h

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -188,30 +188,18 @@ int btintel_enter_mfg(struct hci_dev *hdev);
188188
int btintel_exit_mfg(struct hci_dev *hdev, bool reset, bool patched);
189189
int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
190190
int btintel_set_diag(struct hci_dev *hdev, bool enable);
191-
void btintel_hw_error(struct hci_dev *hdev, u8 code);
192191

193192
int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver);
194-
int btintel_version_info_tlv(struct hci_dev *hdev, struct intel_version_tlv *version);
195-
int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type, u32 plen,
196-
const void *param);
197193
int btintel_load_ddc_config(struct hci_dev *hdev, const char *ddc_name);
198-
int btintel_set_event_mask(struct hci_dev *hdev, bool debug);
199194
int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug);
200195
int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver);
201-
int btintel_read_version_tlv(struct hci_dev *hdev, struct intel_version_tlv *ver);
202-
203196
struct regmap *btintel_regmap_init(struct hci_dev *hdev, u16 opcode_read,
204197
u16 opcode_write);
205198
int btintel_send_intel_reset(struct hci_dev *hdev, u32 boot_param);
206199
int btintel_read_boot_params(struct hci_dev *hdev,
207200
struct intel_boot_params *params);
208201
int btintel_download_firmware(struct hci_dev *dev, struct intel_version *ver,
209202
const struct firmware *fw, u32 *boot_param);
210-
void btintel_reset_to_bootloader(struct hci_dev *hdev);
211-
int btintel_read_debug_features(struct hci_dev *hdev,
212-
struct intel_debug_features *features);
213-
int btintel_set_debug_features(struct hci_dev *hdev,
214-
const struct intel_debug_features *features);
215203
int btintel_configure_setup(struct hci_dev *hdev);
216204
void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len);
217205
void btintel_secure_send_result(struct hci_dev *hdev,
@@ -243,39 +231,18 @@ static inline int btintel_set_diag(struct hci_dev *hdev, bool enable)
243231
return -EOPNOTSUPP;
244232
}
245233

246-
static inline void btintel_hw_error(struct hci_dev *hdev, u8 code)
247-
{
248-
}
249-
250234
static inline int btintel_version_info(struct hci_dev *hdev,
251235
struct intel_version *ver)
252236
{
253237
return -EOPNOTSUPP;
254238
}
255239

256-
static inline int btintel_version_info_tlv(struct hci_dev *hdev,
257-
struct intel_version_tlv *version)
258-
{
259-
return -EOPNOTSUPP;
260-
}
261-
262-
static inline int btintel_secure_send(struct hci_dev *hdev, u8 fragment_type,
263-
u32 plen, const void *param)
264-
{
265-
return -EOPNOTSUPP;
266-
}
267-
268240
static inline int btintel_load_ddc_config(struct hci_dev *hdev,
269241
const char *ddc_name)
270242
{
271243
return -EOPNOTSUPP;
272244
}
273245

274-
static inline int btintel_set_event_mask(struct hci_dev *hdev, bool debug)
275-
{
276-
return -EOPNOTSUPP;
277-
}
278-
279246
static inline int btintel_set_event_mask_mfg(struct hci_dev *hdev, bool debug)
280247
{
281248
return -EOPNOTSUPP;
@@ -287,12 +254,6 @@ static inline int btintel_read_version(struct hci_dev *hdev,
287254
return -EOPNOTSUPP;
288255
}
289256

290-
static inline int btintel_read_version_tlv(struct hci_dev *hdev,
291-
struct intel_version_tlv *ver)
292-
{
293-
return -EOPNOTSUPP;
294-
}
295-
296257
static inline struct regmap *btintel_regmap_init(struct hci_dev *hdev,
297258
u16 opcode_read,
298259
u16 opcode_write)
@@ -319,22 +280,6 @@ static inline int btintel_download_firmware(struct hci_dev *dev,
319280
return -EOPNOTSUPP;
320281
}
321282

322-
static inline void btintel_reset_to_bootloader(struct hci_dev *hdev)
323-
{
324-
}
325-
326-
static inline int btintel_read_debug_features(struct hci_dev *hdev,
327-
struct intel_debug_features *features)
328-
{
329-
return -EOPNOTSUPP;
330-
}
331-
332-
static inline int btintel_set_debug_features(struct hci_dev *hdev,
333-
const struct intel_debug_features *features)
334-
{
335-
return -EOPNOTSUPP;
336-
}
337-
338283
static inline int btintel_configure_setup(struct hci_dev *hdev)
339284
{
340285
return -ENODEV;

0 commit comments

Comments
 (0)