diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2018-04-20 14:44:07 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2018-05-18 06:37:51 +0200 |
| commit | 2cc6d0794cbab470b2d82d5a7547c865fd61e0f3 (patch) | |
| tree | 013ecfdbab2544dc1e9983eb839c8536d0df383d /drivers/bluetooth/btbcm.c | |
| parent | 59ce5699be6d4bc6f24e337c52418b509d64063f (diff) | |
| download | lwn-2cc6d0794cbab470b2d82d5a7547c865fd61e0f3.tar.gz lwn-2cc6d0794cbab470b2d82d5a7547c865fd61e0f3.zip | |
Bluetooth: btbcm: btbcm_initialize(): Initialize hw_name to "BCM"
Initialize hw_name to "BCM", this avoids the need for a number of NULL
checks on hw_name later.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btbcm.c')
| -rw-r--r-- | drivers/bluetooth/btbcm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index d44aa6ff1ed5..99cde1f9467d 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -350,7 +350,7 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len, bool reinit) { u16 subver, rev, pid, vid; - const char *hw_name = NULL; + const char *hw_name = "BCM"; struct sk_buff *skb; struct hci_rp_read_local_version *ver; const struct bcm_subver_table *bcm_subver_table; @@ -403,14 +403,13 @@ int btbcm_initialize(struct hci_dev *hdev, char *fw_name, size_t len, kfree_skb(skb); snprintf(fw_name, len, "brcm/%s-%4.4x-%4.4x.hcd", - hw_name ? : "BCM", vid, pid); + hw_name, vid, pid); } else { - snprintf(fw_name, len, "brcm/%s.hcd", - hw_name ? : "BCM"); + snprintf(fw_name, len, "brcm/%s.hcd", hw_name); } bt_dev_info(hdev, "%s (%3.3u.%3.3u.%3.3u) build %4.4u", - hw_name ? : "BCM", (subver & 0xe000) >> 13, + hw_name, (subver & 0xe000) >> 13, (subver & 0x1f00) >> 8, (subver & 0x00ff), rev & 0x0fff); return 0; |