From patchwork Thu Jul 21 15:52:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sdlyyxy X-Patchwork-Id: 12925482 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 CDFEACCA487 for ; Thu, 21 Jul 2022 15:54:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232435AbiGUPyK (ORCPT ); Thu, 21 Jul 2022 11:54:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233519AbiGUPyE (ORCPT ); Thu, 21 Jul 2022 11:54:04 -0400 Received: from smtpbg511.qq.com (smtpbg511.qq.com [203.205.250.109]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 671AD4B0F7 for ; Thu, 21 Jul 2022 08:54:00 -0700 (PDT) X-QQ-mid: bizesmtp78t1658418834t04gw0na Received: from bupt-poweredger310.tendawifi.co ( [223.72.68.172]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 21 Jul 2022 23:53:53 +0800 (CST) X-QQ-SSF: 01400000002000B0V000B00A0000000 X-QQ-FEAT: GfaJPLQO2RkkCQvYnSYOQtXBqfXmy9HgCPxLWMhivEl+UW1x9ImZNdT1dPm+g BOgn9Rx2ycgYMAXw/sh3HHFDGYm/SrlK1L6lQgJFLygtp3uYb4atRmYy/CUiZdLlcdRG74U nCh+QG5si+OxSmT3rk41pxfei5ZcDZeIA9vEviGCRN2635LWgFHI5EbO2uyTjJWP+cE9ZxC liGLSNy3aMXB5A30IC594NavLFLAT425+GQSLEvxPzKHUl3Z3qkzPl/H6d+HwXgVHJjB+vJ ye+iHX/WhB1RhMpnB1mvfDXC/XAcsqv+Q5uFx2yw/uyRWn1mlNz0e3ny4MsQZVvhUbFxmnq yBr/ZNZQ60Dz/RmFQlALVzMZ7KiqzJsmDq5TCltANgxmlSa5G+lpvDT5wTQKZHFpjfNlLX0 sWtC44M+lXea7JTs3Ut06Q== 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 v2] USB: serial: usb_wwan: replace DTR/RTS magic numbers with macros Date: Thu, 21 Jul 2022 23:52:57 +0800 Message-Id: <20220721155257.631793-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:qybgforeign9 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. --- drivers/usb/serial/usb_wwan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index dab38b63eaf7..a6bd6144702d 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c @@ -29,10 +29,14 @@ #include #include #include +#include #include #include #include "usb-wwan.h" +#define ACM_CTRL_DTR 0x01 +#define ACM_CTRL_RTS 0x02 + /* * Generate DTR/RTS signals on the port using the SET_CONTROL_LINE_STATE request * in CDC ACM. @@ -48,9 +52,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 +63,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);