lkml.org 
[lkml]   [2018]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 4/5] Bluetooth: btusb: Collect the common Intel assignments together
    From
    The BTUSB_INTEL and BTUSB_INTEL_NEW have common functions & quirks are
    assigned to hdev structure. Lets collect them together instead of
    repeating them in different code branches.

    Signed-off-by: Rajat Jain <rajatja@google.com>
    ---
    drivers/bluetooth/btusb.c | 27 ++++++++++++---------------
    1 file changed, 12 insertions(+), 15 deletions(-)

    diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
    index 7439a7eb50ac..e8e148480c91 100644
    --- a/drivers/bluetooth/btusb.c
    +++ b/drivers/bluetooth/btusb.c
    @@ -3077,28 +3077,25 @@ static int btusb_probe(struct usb_interface *intf,
    data->diag = usb_ifnum_to_if(data->udev, ifnum_base + 2);
    }
    #endif
    + if (id->driver_info & BTUSB_INTEL ||
    + id->driver_info & BTUSB_INTEL_NEW) {

    - if (id->driver_info & BTUSB_INTEL) {
    hdev->manufacturer = 2;
    - hdev->setup = btusb_setup_intel;
    - hdev->shutdown = btusb_shutdown_intel;
    - hdev->set_diag = btintel_set_diag_mfg;
    hdev->set_bdaddr = btintel_set_bdaddr;
    set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
    set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
    set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
    - }

    - if (id->driver_info & BTUSB_INTEL_NEW) {
    - hdev->manufacturer = 2;
    - hdev->send = btusb_send_frame_intel;
    - hdev->setup = btusb_setup_intel_new;
    - hdev->hw_error = btintel_hw_error;
    - hdev->set_diag = btintel_set_diag;
    - hdev->set_bdaddr = btintel_set_bdaddr;
    - set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
    - set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
    - set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
    + if (id->driver_info & BTUSB_INTEL) {
    + hdev->setup = btusb_setup_intel;
    + hdev->shutdown = btusb_shutdown_intel;
    + hdev->set_diag = btintel_set_diag_mfg;
    + } else {
    + hdev->send = btusb_send_frame_intel;
    + hdev->setup = btusb_setup_intel_new;
    + hdev->hw_error = btintel_hw_error;
    + hdev->set_diag = btintel_set_diag;
    + }
    }

    if (id->driver_info & BTUSB_MARVELL)
    --
    2.19.1.1215.g8438c0b245-goog
    \
     
     \ /
      Last update: 2018-11-17 02:08    [W:4.304 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site