mwifiex: remove USB8897 chipset support

We don't have any customer using this chipset via USB
interface. if both mwifiex_pcie and mwifiex_usb modules
are enabled by user, sometimes mwifiex_usb wins the race
even if user wants wlan interface to be on PCIe and
USB for bluetooth. This patch solves the problem.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Frank Huang <frankh@marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/mwifiex/Kconfig
index 317d99189556ab1c3025bf11afd7b61449fd124e..279167ddd2935467f62e50208b05fc0f9562623e 100644 (file)
--- a/drivers/net/wireless/mwifiex/Kconfig
+++ b/drivers/net/wireless/mwifiex/Kconfig
@@ -33,12 +33,12 @@ config MWIFIEX_PCIE
          mwifiex_pcie.
 
 config MWIFIEX_USB
-       tristate "Marvell WiFi-Ex Driver for USB8766/8797/8897/8997"
+       tristate "Marvell WiFi-Ex Driver for USB8766/8797/8997"
        depends on MWIFIEX && USB
        select FW_LOADER
        ---help---
          This adds support for wireless adapters based on Marvell
-         8797/8897/8997 chipset with USB interface.
+         8797/8997 chipset with USB interface.
 
          If you choose to build it as a module, it will be called
          mwifiex_usb.

diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
index 9f5356ef0531a9b7e22b3f9cdf19a9ac94fc537e..e43aff932360ef3e99801956b5bca6b8e8649303 100644 (file)
--- a/drivers/net/wireless/mwifiex/usb.c
+++ b/drivers/net/wireless/mwifiex/usb.c
@@ -42,11 +42,6 @@ static struct usb_device_id mwifiex_usb_table[] = {
        {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8801_PID_2,
                                       USB_CLASS_VENDOR_SPEC,
                                       USB_SUBCLASS_VENDOR_SPEC, 0xff)},
-       /* 8897 */
-       {USB_DEVICE(USB8XXX_VID, USB8897_PID_1)},
-       {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8897_PID_2,
-                                      USB_CLASS_VENDOR_SPEC,
-                                      USB_SUBCLASS_VENDOR_SPEC, 0xff)},
        /* 8997 */
        {USB_DEVICE(USB8XXX_VID, USB8997_PID_1)},
        {USB_DEVICE_AND_INTERFACE_INFO(USB8XXX_VID, USB8997_PID_2,
@@ -403,14 +398,12 @@ static int mwifiex_usb_probe(struct usb_interface *intf,
        case USB8766_PID_1:
        case USB8797_PID_1:
        case USB8801_PID_1:
-       case USB8897_PID_1:
        case USB8997_PID_1:
                card->usb_boot_state = USB8XXX_FW_DNLD;
                break;
        case USB8766_PID_2:
        case USB8797_PID_2:
        case USB8801_PID_2:
-       case USB8897_PID_2:
        case USB8997_PID_2:
                card->usb_boot_state = USB8XXX_FW_READY;
                break;
@@ -964,12 +957,6 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
                strcpy(adapter->fw_name, USB8997_DEFAULT_FW_NAME);
                adapter->ext_scan = true;
                break;
-       case USB8897_PID_1:
-       case USB8897_PID_2:
-               adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K;
-               strcpy(adapter->fw_name, USB8897_DEFAULT_FW_NAME);
-               adapter->ext_scan = true;
-               break;
        case USB8766_PID_1:
        case USB8766_PID_2:
                adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K;
@@ -1277,5 +1264,4 @@ MODULE_LICENSE("GPL v2");
 MODULE_FIRMWARE(USB8766_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(USB8797_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(USB8801_DEFAULT_FW_NAME);
-MODULE_FIRMWARE(USB8897_DEFAULT_FW_NAME);
 MODULE_FIRMWARE(USB8997_DEFAULT_FW_NAME);

diff --git a/drivers/net/wireless/mwifiex/usb.h b/drivers/net/wireless/mwifiex/usb.h
index bab10ee41923a4286d6854767bb73a3f59f03e87..67be72b062cf3aea1fbee198ec928875444c64c7 100644 (file)
--- a/drivers/net/wireless/mwifiex/usb.h
+++ b/drivers/net/wireless/mwifiex/usb.h
@@ -28,8 +28,6 @@
 #define USB8766_PID_2          0x2042
 #define USB8797_PID_1          0x2043
 #define USB8797_PID_2          0x2044
-#define USB8897_PID_1          0x2045
-#define USB8897_PID_2          0x2046
 #define USB8801_PID_1          0x2049
 #define USB8801_PID_2          0x204a
 #define USB8997_PID_1          0x204d
@@ -48,7 +46,6 @@
 #define USB8766_DEFAULT_FW_NAME        "mrvl/usb8766_uapsta.bin"
 #define USB8797_DEFAULT_FW_NAME        "mrvl/usb8797_uapsta.bin"
 #define USB8801_DEFAULT_FW_NAME        "mrvl/usb8801_uapsta.bin"
-#define USB8897_DEFAULT_FW_NAME        "mrvl/usb8897_uapsta.bin"
 #define USB8997_DEFAULT_FW_NAME        "mrvl/usb8997_uapsta.bin"
 
 #define FW_DNLD_TX_BUF_SIZE    620