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

Commit 91224dfa authored by Lin Bai's avatar Lin Bai
Browse files

net: cnss2: Remove obsolete device ID assigned to QCA6390 



In initial phase of Hasting emulation, 0x0108 was assigned as
device ID, which is obsolete now, as new ID allocated.

To avoid possible duplicated DID on other platform, here to
remove 0x0108(QCA6390_EMULATION_DEVICE_ID).

Change-Id: I392ff9a41e28ac4be9a419f7ff3bab12abd2e738
Signed-off-by: default avatarLin Bai <lbai@codeaurora.org>
parent 20768179

drivers/net/wireless/cnss2/bus.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#define QCA6290_EMULATION_VENDOR_ID	0x168C

#define QCA6290_EMULATION_DEVICE_ID	0xABCD

#define QCA6390_VENDOR_ID		0x17CB

#define QCA6390_EMULATION_DEVICE_ID	0x0108

#define QCA6390_DEVICE_ID		0x1101



enum cnss_dev_bus_type cnss_get_dev_bus_type(struct device *dev);

drivers/net/wireless/cnss2/main.c

+0 −3
Original line number Diff line number Diff line
@@ -1386,7 +1386,6 @@ int cnss_register_ramdump(struct cnss_plat_data *plat_priv) 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_register_ramdump_v2(plat_priv);

		break;
@@ -1406,7 +1405,6 @@ void cnss_unregister_ramdump(struct cnss_plat_data *plat_priv) 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		cnss_unregister_ramdump_v2(plat_priv);

		break;
@@ -1478,7 +1476,6 @@ static ssize_t cnss_fs_ready_store(struct device *dev, 
	switch (plat_priv->device_id) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		break;

	default:

drivers/net/wireless/cnss2/pci.c

+0 −8
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ int cnss_pci_dev_powerup(struct cnss_pci_data *pci_priv) 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_qca6290_powerup(pci_priv);

		break;
@@ -598,7 +597,6 @@ int cnss_pci_dev_shutdown(struct cnss_pci_data *pci_priv) 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_qca6290_shutdown(pci_priv);

		break;
@@ -626,7 +624,6 @@ int cnss_pci_dev_crash_shutdown(struct cnss_pci_data *pci_priv) 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		cnss_qca6290_crash_shutdown(pci_priv);

		break;
@@ -654,7 +651,6 @@ int cnss_pci_dev_ramdump(struct cnss_pci_data *pci_priv) 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_qca6290_ramdump(pci_priv);

		break;
@@ -2182,7 +2178,6 @@ static int cnss_pci_probe(struct pci_dev *pci_dev, 
		break;

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		ret = cnss_pci_enable_msi(pci_priv);

		if (ret)
@@ -2236,7 +2231,6 @@ static void cnss_pci_remove(struct pci_dev *pci_dev) 
	switch (pci_dev->device) {

	case QCA6290_EMULATION_DEVICE_ID:

	case QCA6290_DEVICE_ID:

	case QCA6390_EMULATION_DEVICE_ID:

	case QCA6390_DEVICE_ID:

		cnss_pci_unregister_mhi(pci_priv);

		cnss_pci_disable_msi(pci_priv);
@@ -2261,8 +2255,6 @@ static const struct pci_device_id cnss_pci_id_table[] = { 
	{ 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 },

	{ QCA6390_VENDOR_ID, QCA6390_EMULATION_DEVICE_ID, PCI_ANY_ID,

	  PCI_ANY_ID },

	{ QCA6390_VENDOR_ID, QCA6390_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID },

	{ 0 }

};