From patchwork Fri Jul 22 08:50:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sdlyyxy X-Patchwork-Id: 592783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F31AC43334 for ; Fri, 22 Jul 2022 08:52:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235061AbiGVIwb (ORCPT ); Fri, 22 Jul 2022 04:52:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235130AbiGVIwJ (ORCPT ); Fri, 22 Jul 2022 04:52:09 -0400 Received: from smtpbgsg1.qq.com (smtpbgsg1.qq.com [54.254.200.92]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43CCD47BA8 for ; Fri, 22 Jul 2022 01:51:30 -0700 (PDT) X-QQ-mid: bizesmtp77t1658479880tvwfy0qv Received: from bupt-poweredger310.tendawifi.co ( [223.72.68.172]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 22 Jul 2022 16:51:19 +0800 (CST) X-QQ-SSF: 01400000002000B0V000B00A0000000 X-QQ-FEAT: R3vftN8GVq+7+a8rsE5Vq0K470afRMomw7k6aHZzPiSoUvyVrZmCHCdzV0xCv p0ZmVEi6GF60uG4nh2g9hGI9iFdwT30Gs9GNkEgblQDov8iAlzb8OLBZo4qjN9VKnvrat35 suLSiYTPG4w2R4mNW6h9I5I9WFOU3LzGb34AQE8zDJRxlsF8cUFYj1kbxvgsTRBixYuECSk A4q0ZvE66OJFnQdaFxURLXL6ohoBdTtLsR5cz2vp0AqZ/BwW0kinbSEt/Xuc9ni5Ly8CQuz rUQM7UI9SLmsGZABTryLaQNd97l0jvCu9lU2BrFAVQuBrJB6msX0APlMJAs8TPmHqbef2QC PW+C/9ADbdTkM3ZVp6fbAHbcxF4Urt3JTxOQ0I5Bww5f8ngGpnMTLxF6wQ5CjH86JqOFmZm tnalZMBgkZA= X-QQ-GoodBg: 2 From: Yan Xinyu To: johan@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Yan Xinyu Subject: [PATCH v3] USB: serial: usb_wwan: replace DTR/RTS magic numbers with macros Date: Fri, 22 Jul 2022 16:50:40 +0800 Message-Id: <20220722085040.704885-1-sdlyyxy@bupt.edu.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:bupt.edu.cn:qybgforeign:qybgforeign10 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The usb_wwan_send_setup function generates DTR/RTS signals in compliance with CDC ACM standard. This patch changes magic numbers in this function to equivalent macros. Signed-off-by: Yan Xinyu --- v1->v2: * Fix Signed-off-by name. v2->v3: * Use already defined ACM_CTRL_DTR and ACM_CTRL_RTS in drivers/usb/class/cdc-acm.h --- drivers/usb/serial/usb_wwan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index dab38b63eaf7..5c8303bd3676 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c @@ -29,8 +29,10 @@ #include #include #include +#include #include #include +#include "../class/cdc-acm.h" #include "usb-wwan.h" /* @@ -48,9 +50,9 @@ static int usb_wwan_send_setup(struct usb_serial_port *port) portdata = usb_get_serial_port_data(port); if (portdata->dtr_state) - val |= 0x01; + val |= ACM_CTRL_DTR; if (portdata->rts_state) - val |= 0x02; + val |= ACM_CTRL_RTS; ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber; @@ -59,8 +61,9 @@ static int usb_wwan_send_setup(struct usb_serial_port *port) return res; res = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), - 0x22, 0x21, val, ifnum, NULL, 0, - USB_CTRL_SET_TIMEOUT); + USB_CDC_REQ_SET_CONTROL_LINE_STATE, + USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, + val, ifnum, NULL, 0, USB_CTRL_SET_TIMEOUT); usb_autopm_put_interface(port->serial->interface);