commit 322acbf42506bac9928577bdf2a3a015be935b11
author Linux Build Service Account <lnxbuild@localhost> Fri May 04 05:21:36 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 04 05:21:35 2018 -0700
tree a3b124c1923059b03c1f00c32a722aabfa0b6d82
parent 77862014e6c3098dcfd116041c5a2617e015d589
parent 922b035a6480973e18cd3ded9e9bebbd8e76ed36

Merge "cnss2: Use general name "wlan" as subsystem name"

drivers/net/wireless/cnss2/main.c

diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c
index 9142758..4c4c761 100644
--- a/drivers/net/wireless/cnss2/main.c
+++ b/drivers/net/wireless/cnss2/main.c
@@ -1799,20 +1799,7 @@
 
 	subsys_info = &plat_priv->subsys_info;
 
-	switch (plat_priv->device_id) {
-	case QCA6174_DEVICE_ID:
-		subsys_info->subsys_desc.name = "AR6320";
-		break;
-	case QCA6290_EMULATION_DEVICE_ID:
-	case QCA6290_DEVICE_ID:
-		subsys_info->subsys_desc.name = "QCA6290";
-		break;
-	default:
-		cnss_pr_err("Unknown device ID: 0x%lx\n", plat_priv->device_id);
-		ret = -ENODEV;
-		goto out;
-	}
-
+	subsys_info->subsys_desc.name = "wlan";
 	subsys_info->subsys_desc.owner = THIS_MODULE;
 	subsys_info->subsys_desc.powerup = cnss_subsys_powerup;
 	subsys_info->subsys_desc.shutdown = cnss_subsys_shutdown;