From nobody Thu Sep 18 23:30:19 2025 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 4ED47C4332F for ; Fri, 2 Dec 2022 08:56:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232804AbiLBI4T (ORCPT ); Fri, 2 Dec 2022 03:56:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232711AbiLBI4E (ORCPT ); Fri, 2 Dec 2022 03:56:04 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8602CBF652 for ; Fri, 2 Dec 2022 00:56:01 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id y16so6800740wrm.2 for ; Fri, 02 Dec 2022 00:56:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DkZacf9TX3zvyVeUrL+nHxYirMYsPuTeW+Zo+lEbcT0=; b=audPTcU4fkq3Zx83ZmW8f2CeTC8lK8Q6HlKtxI12ZXi95gAUwG1BljzAeGhd+Q4ETq q4uBA2rcMSIgo97vPGQF19/ESkjO5BEdShrXtH44qvHvvbtlY3x29vFrXOwTahFV1R46 /THe6pVVBb53ahlU3Rv9xNDfsetJB21kYbLqB9zM3qixO4VTYAbDAa+L/AMzFQ9skcRc gkIdz74mXiWySIbVljOaZBagfeiB1KOW01S5Ozfsnt7ATOI+13bdr+dKfv82ney+BEuK Pv4zra6b+anW2con6ri1QHTHkkpNnn1SCYkSiiOPZxRkNPAHYhykTTiaA5bbkB6pV7Q3 cc1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DkZacf9TX3zvyVeUrL+nHxYirMYsPuTeW+Zo+lEbcT0=; b=IBdE0VYd1x4c1fmPWmdK2qasUpn3k3wkW/dXtyje+XC2NvothpYPFzaFjkGWFGVPXr zIxTBUGQpBi8AbUBbfFDEp8zTkszOS8uLgziNdCOQpsEmCtTuOgDuYvZT9gI01FcgNX2 tQ8yQRNbO4D3RMYIOn3yHDqbNY2FhFfMxJeFf++e+ij4FoDC5QpGOi02hRgesnbwibFi Vf8ZoBc00H1JPANNQ+UpUKJjNj1M/VXa8JDtVVcSEvLM81bKjg2rr2hLZ9901oO9POn+ oJXfnW1zpaU8+PF70ao/WCxei4SBoo30ZGR022q1ORm/cE2PwxpYVUUSMkvCAgYBCn03 Sa6Q== X-Gm-Message-State: ANoB5pmIbY7QQB26Vo0KW8IMbTGKFtNuz2egKgi8PAtUWQ9UQjk5tJrE kKcYmnvMuw8B32pLUms5EzfYpQ== X-Google-Smtp-Source: AA0mqf68rd7ytSpqr3O/nR2OCv810lyUs6399ZBHc39hqoYlG3CGoZyS/f2KcAaIjNJyqtzVtvt6hw== X-Received: by 2002:adf:e64f:0:b0:241:e2f1:8b44 with SMTP id b15-20020adfe64f000000b00241e2f18b44mr30150395wrn.300.1669971361117; Fri, 02 Dec 2022 00:56:01 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:29a4:6f04:ddb1:1ed7]) by smtp.gmail.com with ESMTPSA id a13-20020adfed0d000000b0024219b1cb1bsm6527517wro.60.2022.12.02.00.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Dec 2022 00:56:00 -0800 (PST) From: Bartosz Golaszewski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Greg Kroah-Hartman , Jiri Slaby , Srinivas Kandagatla , Vinod Koul , Alex Elder , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v5 04/14] tty: serial: qcom-geni-serial: improve the to_dev_port() macro Date: Fri, 2 Dec 2022 09:55:44 +0100 Message-Id: <20221202085554.59637-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221202085554.59637-1-brgl@bgdev.pl> References: <20221202085554.59637-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski The member we want to resolve in struct qcom_geni_serial_port is called uport so we don't need an additional redundant parameter in this macro. While at it: turn the macro into a static inline function. Signed-off-by: Bartosz Golaszewski Reviewed-by: Konrad Dybcio --- drivers/tty/serial/qcom_geni_serial.c | 36 ++++++++++++++------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qco= m_geni_serial.c index 97ee7c074b79..e4139718e084 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -133,8 +133,10 @@ static const struct uart_ops qcom_geni_uart_pops; static struct uart_driver qcom_geni_console_driver; static struct uart_driver qcom_geni_uart_driver; =20 -#define to_dev_port(ptr, member) \ - container_of(ptr, struct qcom_geni_serial_port, member) +static inline struct qcom_geni_serial_port *to_dev_port(struct uart_port *= uport) +{ + return container_of(uport, struct qcom_geni_serial_port, uport); +} =20 static struct qcom_geni_serial_port qcom_geni_uart_ports[GENI_UART_PORTS] = =3D { [0] =3D { @@ -175,7 +177,7 @@ static struct qcom_geni_serial_port qcom_geni_console_p= ort =3D { static int qcom_geni_serial_request_port(struct uart_port *uport) { struct platform_device *pdev =3D to_platform_device(uport->dev); - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 uport->membase =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(uport->membase)) @@ -212,7 +214,7 @@ static void qcom_geni_serial_set_mctrl(struct uart_port= *uport, unsigned int mctrl) { u32 uart_manual_rfr =3D 0; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 if (uart_console(uport)) return; @@ -253,7 +255,7 @@ static bool qcom_geni_serial_poll_bit(struct uart_port = *uport, struct qcom_geni_private_data *private_data =3D uport->private_data; =20 if (private_data->drv) { - port =3D to_dev_port(uport, uport); + port =3D to_dev_port(uport); baud =3D port->baud; if (!baud) baud =3D 115200; @@ -506,7 +508,7 @@ static int handle_rx_console(struct uart_port *uport, u= 32 bytes, bool drop) u32 i; unsigned char buf[sizeof(u32)]; struct tty_port *tport; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 tport =3D &uport->state->port; for (i =3D 0; i < bytes; ) { @@ -549,7 +551,7 @@ static int handle_rx_console(struct uart_port *uport, u= 32 bytes, bool drop) static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) { struct tty_port *tport; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); u32 num_bytes_pw =3D port->tx_fifo_width / BITS_PER_BYTE; u32 words =3D ALIGN(bytes, num_bytes_pw) / num_bytes_pw; int ret; @@ -598,7 +600,7 @@ static void qcom_geni_serial_stop_tx(struct uart_port *= uport) { u32 irq_en; u32 status; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 irq_en =3D readl(uport->membase + SE_GENI_M_IRQ_EN); irq_en &=3D ~(M_CMD_DONE_EN | M_TX_FIFO_WATERMARK_EN); @@ -627,7 +629,7 @@ static void qcom_geni_serial_handle_rx(struct uart_port= *uport, bool drop) u32 last_word_byte_cnt; u32 last_word_partial; u32 total_bytes; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 status =3D readl(uport->membase + SE_GENI_RX_FIFO_STATUS); word_cnt =3D status & RX_FIFO_WC_MSK; @@ -649,7 +651,7 @@ static void qcom_geni_serial_stop_rx(struct uart_port *= uport) { u32 irq_en; u32 status; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); u32 s_irq_status; =20 irq_en =3D readl(uport->membase + SE_GENI_S_IRQ_EN); @@ -687,7 +689,7 @@ static void qcom_geni_serial_start_rx(struct uart_port = *uport) { u32 irq_en; u32 status; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 status =3D readl(uport->membase + SE_GENI_STATUS); if (status & S_GENI_CMD_ACTIVE) @@ -707,7 +709,7 @@ static void qcom_geni_serial_start_rx(struct uart_port = *uport) static void qcom_geni_serial_handle_tx(struct uart_port *uport, bool done, bool active) { - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); struct circ_buf *xmit =3D &uport->state->xmit; size_t avail; size_t remaining; @@ -803,7 +805,7 @@ static irqreturn_t qcom_geni_serial_isr(int isr, void *= dev) struct uart_port *uport =3D dev; bool drop_rx =3D false; struct tty_port *tport =3D &uport->state->port; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 if (uport->suspended) return IRQ_NONE; @@ -869,7 +871,7 @@ static void qcom_geni_serial_shutdown(struct uart_port = *uport) =20 static int qcom_geni_serial_port_setup(struct uart_port *uport) { - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); u32 rxstale =3D DEFAULT_BITS_PER_CHAR * STALE_TIMEOUT; u32 proto; u32 pin_swap; @@ -917,7 +919,7 @@ static int qcom_geni_serial_port_setup(struct uart_port= *uport) static int qcom_geni_serial_startup(struct uart_port *uport) { int ret; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 if (!port->setup) { ret =3D qcom_geni_serial_port_setup(uport); @@ -1003,7 +1005,7 @@ static void qcom_geni_serial_set_termios(struct uart_= port *uport, u32 stop_bit_len; unsigned int clk_div; u32 ser_clk_cfg; - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); unsigned long clk_rate; u32 ver, sampling_rate; unsigned int avg_bw_core; @@ -1288,7 +1290,7 @@ static struct uart_driver qcom_geni_uart_driver =3D { static void qcom_geni_serial_pm(struct uart_port *uport, unsigned int new_state, unsigned int old_state) { - struct qcom_geni_serial_port *port =3D to_dev_port(uport, uport); + struct qcom_geni_serial_port *port =3D to_dev_port(uport); =20 /* If we've never been called, treat it as off */ if (old_state =3D=3D UART_PM_STATE_UNDEFINED) --=20 2.37.2