From patchwork Mon Mar 24 16:34:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Dominik_Karol_Pi=C4=85tkowski?= X-Patchwork-Id: 876503 Received: from mail-24418.protonmail.ch (mail-24418.protonmail.ch [109.224.244.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C35CE263C82 for ; Mon, 24 Mar 2025 16:34:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=109.224.244.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742834101; cv=none; b=YVhcCxBeL7PK4HltYzgEKnioDZw1Hqjjf4bvWAyUENVigf43hEnttIQn7g4nmirgmqKByySFbc+LQuJrpEhTF/4JOyGCX5zn4gmzMrX5KN2ficG85vorEhM8du0uKVzYiEntJEoBuHJh3LKN1FZqF8EEJAbk5EajVj/jMiBb2oc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742834101; c=relaxed/simple; bh=2VKwLKmGkpdlcqWpdTlu23oo/O/asD2Au7MWuT1zRfs=; h=Date:To:From:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=hBoAgJ8jHb8fCH+uO5mwpwwu5Psd5rQCQiJhjzUGwCnFRyel4vg8pl5rDqmAR96w8H2d0ip/rJkefjTdUF/5rd+hPop+m6KebUKFqefSCD/JiR2TjlAZIdFPBDGapUUmB/QRC/vepcYriM2gxvAoYLipbyaCSReV8fqYwFKnMlg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com; spf=pass smtp.mailfrom=protonmail.com; dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com header.b=pQF1AnL1; arc=none smtp.client-ip=109.224.244.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=protonmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=protonmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com header.b="pQF1AnL1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1742834096; x=1743093296; bh=cbW/EsJAuMcQQgCqI6Tdr4zGMRd9Zt3XpLehMUEoLmc=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=pQF1AnL11/ENhlaHNLFaqjzEbbHX4vkdwUGrYJQBcI3ATBo++XTo9821F+lp3esZ6 p5qSjZJkkPM5V3nEyx5jX/oDTJVu/r43MB3S3G05zYgGtkJKOkFr469k2G6/iHqgMY /tXF4fXOBqzE+fUI1iC0izPebovByI2o6mMam1AOdwi96l/BcdeN3Hepc+hcuLqJb7 9gmrgSlDOGPwn8YuOD9o9vFlsh4SLtUY9AA4KbrxK5A/xRHzrsUqlYoM9UnEFh7DXL KgaxLCWZ+Vfp1umvtJDUjKuaCXEqeONspIdtbd3ZzJ5E6O5V2TzBV2J/VrkF2q/e+k BT/6GTq7lNdtw== Date: Mon, 24 Mar 2025 16:34:50 +0000 To: Johan Hovold , Greg Kroah-Hartman From: =?utf-8?q?Dominik_Karol_Pi=C4=85tkowski?= Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Domin?= =?utf-8?q?ik_Karol_Pi=C4=85tkowski?= Subject: [PATCH] USB: serial: ftdi_sio: Code style cleanup Message-ID: <20250324163358.134541-1-dominik.karol.piatkowski@protonmail.com> Feedback-ID: 117888567:user:proton X-Pm-Message-ID: 3b940895cc1138ccce87b8db6a9d4ae75e968b3c Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fix the following code style issues: - Space before comma - Missing blank line after declarations - Superfluous space before statement - Spaces used for indentation instead of tabs - Misaligned block comment - Space before tabs Signed-off-by: Dominik Karol Piątkowski --- drivers/usb/serial/ftdi_sio.c | 16 ++++++++++------ drivers/usb/serial/ftdi_sio.h | 2 +- drivers/usb/serial/ftdi_sio_ids.h | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 9b34e23b7091..60d24152e385 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -190,7 +190,7 @@ static const struct usb_device_id id_table_combined[] = { { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, { USB_DEVICE(FTDI_VID, FTDI_232RL_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID) , + { USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID), .driver_info = (kernel_ulong_t)&ftdi_8u2232c_quirk }, { USB_DEVICE(FTDI_VID, FTDI_4232H_PID) }, { USB_DEVICE(FTDI_VID, FTDI_232H_PID) }, @@ -1143,6 +1143,7 @@ static unsigned short int ftdi_232am_baud_base_to_divisor(int baud, int base) unsigned short int divisor; /* divisor shifted 3 bits to the left */ int divisor3 = DIV_ROUND_CLOSEST(base, 2 * baud); + if ((divisor3 & 0x7) == 7) divisor3++; /* round x.7/8 up to x+1 */ divisor = divisor3 >> 3; @@ -1160,7 +1161,7 @@ static unsigned short int ftdi_232am_baud_base_to_divisor(int baud, int base) static unsigned short int ftdi_232am_baud_to_divisor(int baud) { - return ftdi_232am_baud_base_to_divisor(baud, 48000000); + return ftdi_232am_baud_base_to_divisor(baud, 48000000); } static u32 ftdi_232bm_baud_base_to_divisor(int baud, int base) @@ -1169,6 +1170,7 @@ static u32 ftdi_232bm_baud_base_to_divisor(int baud, int base) u32 divisor; /* divisor shifted 3 bits to the left */ int divisor3 = DIV_ROUND_CLOSEST(base, 2 * baud); + divisor = divisor3 >> 3; divisor |= (u32)divfrac[divisor3 & 0x7] << 14; /* Deal with special cases for highest baud rates. */ @@ -1181,7 +1183,7 @@ static u32 ftdi_232bm_baud_base_to_divisor(int baud, int base) static u32 ftdi_232bm_baud_to_divisor(int baud) { - return ftdi_232bm_baud_base_to_divisor(baud, 48000000); + return ftdi_232bm_baud_base_to_divisor(baud, 48000000); } static u32 ftdi_2232h_baud_base_to_divisor(int baud, int base) @@ -1211,7 +1213,7 @@ static u32 ftdi_2232h_baud_base_to_divisor(int baud, int base) static u32 ftdi_2232h_baud_to_divisor(int baud) { - return ftdi_2232h_baud_base_to_divisor(baud, 120000000); + return ftdi_2232h_baud_base_to_divisor(baud, 120000000); } #define set_mctrl(port, set) update_mctrl((port), (set), 0) @@ -1657,6 +1659,7 @@ static ssize_t latency_timer_show(struct device *dev, { struct usb_serial_port *port = to_usb_serial_port(dev); struct ftdi_private *priv = usb_get_serial_port_data(port); + if (priv->flags & ASYNC_LOW_LATENCY) return sprintf(buf, "1\n"); else @@ -2194,6 +2197,7 @@ static int ftdi_probe(struct usb_serial *serial, const struct usb_device_id *id) if (quirk && quirk->probe) { int ret = quirk->probe(serial); + if (ret != 0) return ret; } @@ -2621,8 +2625,8 @@ static bool ftdi_tx_empty(struct usb_serial_port *port) * WARNING: set_termios calls this with old_termios in kernel space */ static void ftdi_set_termios(struct tty_struct *tty, - struct usb_serial_port *port, - const struct ktermios *old_termios) + struct usb_serial_port *port, + const struct ktermios *old_termios) { struct usb_device *dev = port->serial->dev; struct device *ddev = &port->dev; diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 55ea61264f91..d671d2194c64 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -95,7 +95,7 @@ * * The Purge RX and TX buffer commands affect nothing except the buffers * - */ + */ /* FTDI_SIO_SET_BAUDRATE */ #define FTDI_SIO_SET_BAUDRATE_REQUEST_TYPE 0x40 diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 52be47d684ea..3d9f6ed97783 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -1022,7 +1022,7 @@ * Kondo Kagaku Co.Ltd. * http://www.kondo-robot.com/EN */ -#define KONDO_VID 0x165c +#define KONDO_VID 0x165c #define KONDO_USB_SERIAL_PID 0x0002 /* @@ -1446,7 +1446,7 @@ /* * Accesio USB Data Acquisition products (http://www.accesio.com/) */ -#define ACCESIO_COM4SM_PID 0xD578 +#define ACCESIO_COM4SM_PID 0xD578 /* www.sciencescope.co.uk educational dataloggers */ #define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18