Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85177919 authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Remove deprecated device IDs for emulation devices 



These deprecated device IDs for emulation devices are not used
anymore. Hence remove them.

Change-Id: I9d60f70d1b8a9d3ffac63826e80d95896d254eaa
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent 0f1dd582

drivers/net/wireless/cnss2/bus.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ enum cnss_dev_bus_type cnss_get_bus_type(unsigned long device_id) 
{

{

	switch (device_id) {

	switch (device_id) {

	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		return CNSS_BUS_PCI;

		return CNSS_BUS_PCI;

drivers/net/wireless/cnss2/bus.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,6 @@ 
#define QCA6174_REV3_2_VERSION		0x5030000

#define QCA6174_REV3_2_VERSION		0x5030000

#define QCA6290_VENDOR_ID		0x17CB

#define QCA6290_VENDOR_ID		0x17CB

#define QCA6290_DEVICE_ID		0x1100

#define QCA6290_DEVICE_ID		0x1100

#define QCA6290_EMULATION_VENDOR_ID	0x168C

#define QCA6290_EMULATION_DEVICE_ID	0xABCD

#define QCA6390_VENDOR_ID		0x17CB

#define QCA6390_VENDOR_ID		0x17CB

#define QCA6390_DEVICE_ID		0x1101

#define QCA6390_DEVICE_ID		0x1101

drivers/net/wireless/cnss2/main.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1384,7 +1384,6 @@ int cnss_register_ramdump(struct cnss_plat_data *plat_priv) 
	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

		ret = cnss_register_ramdump_v1(plat_priv);

		ret = cnss_register_ramdump_v1(plat_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_register_ramdump_v2(plat_priv);

		ret = cnss_register_ramdump_v2(plat_priv);
@@ -1403,7 +1402,6 @@ void cnss_unregister_ramdump(struct cnss_plat_data *plat_priv) 
	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

		cnss_unregister_ramdump_v1(plat_priv);

		cnss_unregister_ramdump_v1(plat_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		cnss_unregister_ramdump_v2(plat_priv);

		cnss_unregister_ramdump_v2(plat_priv);
@@ -1474,7 +1472,6 @@ static ssize_t cnss_fs_ready_store(struct device *dev, 
	}

	}





	switch (plat_priv->device_id) {

	switch (plat_priv->device_id) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		break;

		break;

drivers/net/wireless/cnss2/pci.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -568,7 +568,6 @@ int cnss_pci_dev_powerup(struct cnss_pci_data *pci_priv) 
	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_powerup(pci_priv);

		ret = cnss_qca6174_powerup(pci_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_qca6290_powerup(pci_priv);

		ret = cnss_qca6290_powerup(pci_priv);
@@ -595,7 +594,6 @@ int cnss_pci_dev_shutdown(struct cnss_pci_data *pci_priv) 
	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_shutdown(pci_priv);

		ret = cnss_qca6174_shutdown(pci_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_qca6290_shutdown(pci_priv);

		ret = cnss_qca6290_shutdown(pci_priv);
@@ -622,7 +620,6 @@ int cnss_pci_dev_crash_shutdown(struct cnss_pci_data *pci_priv) 
	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

		cnss_qca6174_crash_shutdown(pci_priv);

		cnss_qca6174_crash_shutdown(pci_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		cnss_qca6290_crash_shutdown(pci_priv);

		cnss_qca6290_crash_shutdown(pci_priv);
@@ -649,7 +646,6 @@ int cnss_pci_dev_ramdump(struct cnss_pci_data *pci_priv) 
	case QCA6174_DEVICE_ID:

	case QCA6174_DEVICE_ID:

		ret = cnss_qca6174_ramdump(pci_priv);

		ret = cnss_qca6174_ramdump(pci_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_qca6290_ramdump(pci_priv);

		ret = cnss_qca6290_ramdump(pci_priv);
@@ -2242,7 +2238,6 @@ static int cnss_pci_probe(struct pci_dev *pci_dev, 
				    ret);

				    ret);

		cnss_power_off_device(plat_priv);

		cnss_power_off_device(plat_priv);

		break;

		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_pci_enable_msi(pci_priv);

		ret = cnss_pci_enable_msi(pci_priv);
@@ -2295,7 +2290,6 @@ static void cnss_pci_remove(struct pci_dev *pci_dev) 
	cnss_pci_free_fw_mem(pci_priv);

	cnss_pci_free_fw_mem(pci_priv);





	switch (pci_dev->device) {

	switch (pci_dev->device) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		cnss_pci_unregister_mhi(pci_priv);

		cnss_pci_unregister_mhi(pci_priv);
@@ -2318,8 +2312,6 @@ static void cnss_pci_remove(struct pci_dev *pci_dev) 




static const struct pci_device_id cnss_pci_id_table[] = {

static const struct pci_device_id cnss_pci_id_table[] = {

	{ QCA6174_VENDOR_ID, QCA6174_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6174_VENDOR_ID, QCA6174_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6290_EMULATION_VENDOR_ID, QCA6290_EMULATION_DEVICE_ID,

	  PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6290_VENDOR_ID, QCA6290_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6290_VENDOR_ID, QCA6290_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6390_VENDOR_ID, QCA6390_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ QCA6390_VENDOR_ID, QCA6390_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ 0 }

	{ 0 }