[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210929194547.46954-2-rikard.falkeborn@gmail.com>
Date: Wed, 29 Sep 2021 21:45:46 +0200
From: Rikard Falkeborn <rikard.falkeborn@...il.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Loic Poulain <loic.poulain@...aro.org>,
Wei Yongjun <weiyongjun1@...wei.com>
Cc: Oliver Neukum <oneukum@...e.com>,
Tetsuo Handa <penguin-kernel@...ove.sakura.ne.jp>,
Junlin Yang <yangjunlin@...ong.com>, linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org,
Rikard Falkeborn <rikard.falkeborn@...il.com>,
stable@...r.kernel.org
Subject: [PATCH V2 1/2] usb: cdc-wdm: Fix check for WWAN
CONFIG_WWAN_CORE was with CONFIG_WWAN in commit 89212e160b81 ("net: wwan:
Fix WWAN config symbols"), but did not update all users of it. Change it
back to use CONFIG_WWAN instead.
Fixes: 89212e160b81 ("net: wwan: Fix WWAN config symbols")
Cc: <stable@...r.kernel.org>
Signed-off-by: Rikard Falkeborn <rikard.falkeborn@...il.com>
---
Changes:
V1-V2: Use ifdef instead of IS_ENABLED
drivers/usb/class/cdc-wdm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 35d5908b5478..fdf79bcf7eb0 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -824,7 +824,7 @@ static struct usb_class_driver wdm_class = {
};
/* --- WWAN framework integration --- */
-#ifdef CONFIG_WWAN_CORE
+#ifdef CONFIG_WWAN
static int wdm_wwan_port_start(struct wwan_port *port)
{
struct wdm_device *desc = wwan_port_get_drvdata(port);
@@ -963,11 +963,11 @@ static void wdm_wwan_rx(struct wdm_device *desc, int length)
/* inbuf has been copied, it is safe to check for outstanding data */
schedule_work(&desc->service_outs_intr);
}
-#else /* CONFIG_WWAN_CORE */
+#else /* CONFIG_WWAN */
static void wdm_wwan_init(struct wdm_device *desc) {}
static void wdm_wwan_deinit(struct wdm_device *desc) {}
static void wdm_wwan_rx(struct wdm_device *desc, int length) {}
-#endif /* CONFIG_WWAN_CORE */
+#endif /* CONFIG_WWAN */
/* --- error handling --- */
static void wdm_rxwork(struct work_struct *work)
--
2.33.0
Powered by blists - more mailing lists