Skip to content

Commit 67d4dba

Browse files
kirankrishnappa-intelVudentz
authored andcommitted
Bluetooth: btintel: Export few static functions
Some of the functions used in btintel.c is made global so that they can be reused in other transport drivers apart from USB. Signed-off-by: Kiran K <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 84a4bb6 commit 67d4dba

File tree

2 files changed

+59
-10
lines changed

2 files changed

+59
-10
lines changed

drivers/bluetooth/btintel.c

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static int btintel_set_diag_combined(struct hci_dev *hdev, bool enable)
245245
return ret;
246246
}
247247

248-
static void btintel_hw_error(struct hci_dev *hdev, u8 code)
248+
void btintel_hw_error(struct hci_dev *hdev, u8 code)
249249
{
250250
struct sk_buff *skb;
251251
u8 type = 0x00;
@@ -277,6 +277,7 @@ static void btintel_hw_error(struct hci_dev *hdev, u8 code)
277277

278278
kfree_skb(skb);
279279
}
280+
EXPORT_SYMBOL_GPL(btintel_hw_error);
280281

281282
int btintel_version_info(struct hci_dev *hdev, struct intel_version *ver)
282283
{
@@ -455,8 +456,8 @@ int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver)
455456
}
456457
EXPORT_SYMBOL_GPL(btintel_read_version);
457458

458-
static int btintel_version_info_tlv(struct hci_dev *hdev,
459-
struct intel_version_tlv *version)
459+
int btintel_version_info_tlv(struct hci_dev *hdev,
460+
struct intel_version_tlv *version)
460461
{
461462
const char *variant;
462463

@@ -544,10 +545,11 @@ static int btintel_version_info_tlv(struct hci_dev *hdev,
544545

545546
return 0;
546547
}
548+
EXPORT_SYMBOL_GPL(btintel_version_info_tlv);
547549

548-
static int btintel_parse_version_tlv(struct hci_dev *hdev,
549-
struct intel_version_tlv *version,
550-
struct sk_buff *skb)
550+
int btintel_parse_version_tlv(struct hci_dev *hdev,
551+
struct intel_version_tlv *version,
552+
struct sk_buff *skb)
551553
{
552554
/* Consume Command Complete Status field */
553555
skb_pull(skb, 1);
@@ -649,6 +651,7 @@ static int btintel_parse_version_tlv(struct hci_dev *hdev,
649651

650652
return 0;
651653
}
654+
EXPORT_SYMBOL_GPL(btintel_parse_version_tlv);
652655

653656
static int btintel_read_version_tlv(struct hci_dev *hdev,
654657
struct intel_version_tlv *version)
@@ -2597,8 +2600,8 @@ static void btintel_set_dsm_reset_method(struct hci_dev *hdev,
25972600
data->acpi_reset_method = btintel_acpi_reset_method;
25982601
}
25992602

2600-
static int btintel_bootloader_setup_tlv(struct hci_dev *hdev,
2601-
struct intel_version_tlv *ver)
2603+
int btintel_bootloader_setup_tlv(struct hci_dev *hdev,
2604+
struct intel_version_tlv *ver)
26022605
{
26032606
u32 boot_param;
26042607
char ddcname[64];
@@ -2682,8 +2685,9 @@ static int btintel_bootloader_setup_tlv(struct hci_dev *hdev,
26822685

26832686
return 0;
26842687
}
2688+
EXPORT_SYMBOL_GPL(btintel_bootloader_setup_tlv);
26852689

2686-
static void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant)
2690+
void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant)
26872691
{
26882692
switch (hw_variant) {
26892693
/* Legacy bootloader devices that supports MSFT Extension */
@@ -2707,6 +2711,7 @@ static void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant)
27072711
break;
27082712
}
27092713
}
2714+
EXPORT_SYMBOL_GPL(btintel_set_msft_opcode);
27102715

27112716
static void btintel_print_fseq_info(struct hci_dev *hdev)
27122717
{
@@ -3078,7 +3083,7 @@ static int btintel_setup_combined(struct hci_dev *hdev)
30783083
return err;
30793084
}
30803085

3081-
static int btintel_shutdown_combined(struct hci_dev *hdev)
3086+
int btintel_shutdown_combined(struct hci_dev *hdev)
30823087
{
30833088
struct sk_buff *skb;
30843089
int ret;
@@ -3112,6 +3117,7 @@ static int btintel_shutdown_combined(struct hci_dev *hdev)
31123117

31133118
return 0;
31143119
}
3120+
EXPORT_SYMBOL_GPL(btintel_shutdown_combined);
31153121

31163122
int btintel_configure_setup(struct hci_dev *hdev, const char *driver_name)
31173123
{

drivers/bluetooth/btintel.h

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,16 @@ void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len);
234234
void btintel_secure_send_result(struct hci_dev *hdev,
235235
const void *ptr, unsigned int len);
236236
int btintel_set_quality_report(struct hci_dev *hdev, bool enable);
237+
int btintel_version_info_tlv(struct hci_dev *hdev,
238+
struct intel_version_tlv *version);
239+
int btintel_parse_version_tlv(struct hci_dev *hdev,
240+
struct intel_version_tlv *version,
241+
struct sk_buff *skb);
242+
void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant);
243+
int btintel_bootloader_setup_tlv(struct hci_dev *hdev,
244+
struct intel_version_tlv *ver);
245+
int btintel_shutdown_combined(struct hci_dev *hdev);
246+
void btintel_hw_error(struct hci_dev *hdev, u8 code);
237247
#else
238248

239249
static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -330,4 +340,37 @@ static inline int btintel_set_quality_report(struct hci_dev *hdev, bool enable)
330340
{
331341
return -ENODEV;
332342
}
343+
344+
static inline int btintel_version_info_tlv(struct hci_dev *hdev,
345+
struct intel_version_tlv *version)
346+
{
347+
return -EOPNOTSUPP;
348+
}
349+
350+
static inline int btintel_parse_version_tlv(struct hci_dev *hdev,
351+
struct intel_version_tlv *version,
352+
struct sk_buff *skb)
353+
{
354+
return -EOPNOTSUPP;
355+
}
356+
357+
static inline void btintel_set_msft_opcode(struct hci_dev *hdev, u8 hw_variant)
358+
359+
{
360+
}
361+
362+
static inline int btintel_bootloader_setup_tlv(struct hci_dev *hdev,
363+
struct intel_version_tlv *ver)
364+
{
365+
return -ENODEV;
366+
}
367+
368+
static inline int btintel_shutdown_combined(struct hci_dev *hdev)
369+
{
370+
return -ENODEV;
371+
}
372+
373+
static void btintel_hw_error(struct hci_dev *hdev, u8 code)
374+
{
375+
}
333376
#endif

0 commit comments

Comments
 (0)