From nobody Tue Jun 23 11:16:48 2026 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 2ABB9C433F5 for ; Mon, 7 Mar 2022 08:08:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236073AbiCGIJe (ORCPT ); Mon, 7 Mar 2022 03:09:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236064AbiCGIJR (ORCPT ); Mon, 7 Mar 2022 03:09:17 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3750193DF for ; Mon, 7 Mar 2022 00:08:23 -0800 (PST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8FE183F610 for ; Mon, 7 Mar 2022 08:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640502; bh=eR7Mc9vi/w7iGpwa309YiCzl9zkdxojESdgSBLZGEv4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sNowG0pJ2TSSnt9f6dK0Ww1LZSh1q8kAb99umQalH2q9mH0wEKBo9MenhslcAedR/ W3L2ZpGwQDu6+1eBObRj0iJdl+Dqt9B6wdQNg/PMy2MNB0p4NIKWnL8gJfvLe254HB zC1Tnfxe27a//jq4nRh6aLayAiIor4u368l1TY5h5ENmpdCPJvZ10L3lO3dHHnD6Fv weynCKoOaRknIL3VbnzeM6cTKRwzVlz1igzkBiyaeUOCQgilnve65sd7BzDB5Y4cgq EZD2q1y//mQzOiNTdcmZERyCd/vkrC1QkAhoIIiV4Oa8l+FxVOPfJnqVYskuwf2ok1 khaYAdL4m2sGw== Received: by mail-ej1-f69.google.com with SMTP id m4-20020a170906160400b006be3f85906eso6613781ejd.23 for ; Mon, 07 Mar 2022 00:08:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eR7Mc9vi/w7iGpwa309YiCzl9zkdxojESdgSBLZGEv4=; b=Myl4oVEPc/Zv7jS2carE60Lq7XR9drj4yR5ewItllkwnp2tvppjIIltc2W02FewTfn ZnVIed2Kv29Crz4A6b2vT3w6WYvwdvtaQS/LdF19YHO2DqmJR0aPBJExfxjV60geeBP3 A3OenQKM1yDSzIxO778dpiAijtj+0ceGchlaiWYu4OdGonLEiNxJTgCx0UpS3ih/S+5A teFj+bD7W2pHLVrUoVysACTXcLmnASVAIXPJhr2+zGKTc0OXTUMC2STabCxRaeXYVhRL GpN5tICLnTeAU45MOglWj6gUSNAFW9vmzoVZnjs13p6I5ImExVrOcvRN6ezKcAorCWsA 3oTA== X-Gm-Message-State: AOAM531/XJKHBfR+FrOaypTwy6rxpRi9VFBnCER7gxFfTpZNEECfI/lQ 7YfgiumJM/bvAPryNf0hhruX5mLQY3F+Z1mAFmNunfYaCejAe2+9GTmByL9swOYgWJQTOcjNvZ5 NCLdmuei2YeD0SwryX3P5kme6FPnwx3N8FCs8Yw7VTQ== X-Received: by 2002:a05:6402:239b:b0:415:a36e:99c0 with SMTP id j27-20020a056402239b00b00415a36e99c0mr9870068eda.283.1646640500563; Mon, 07 Mar 2022 00:08:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxpUqnQcFhltzbiTgvk4iIo+PNlDFJdT98Fxk5y0pBKW8l18KW8SAiAS4UDqIaBE1SiIT6jnQ== X-Received: by 2002:a05:6402:239b:b0:415:a36e:99c0 with SMTP id j27-20020a056402239b00b00415a36e99c0mr9870056eda.283.1646640500396; Mon, 07 Mar 2022 00:08:20 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fs6-20020a170907600600b006da8ec6e4a6sm4444584ejc.26.2022.03.07.00.08.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:08:19 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/7] tty: serial: samsung: embed s3c24xx_uart_info in parent structure Date: Mon, 7 Mar 2022 09:08:04 +0100 Message-Id: <20220307080810.53847-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" Embed "struct s3c24xx_uart_info" directly as a member of "struct s3c24xx_serial_drv_data" instead of keeping it as a pointer. This makes the code clearer (obvious ownership of "struct s3c24xx_serial_drv_data") and saves one pointer. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jiri Slaby Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index d002a4e48ed9..aa5678d03704 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -85,7 +85,7 @@ struct s3c24xx_uart_info { }; =20 struct s3c24xx_serial_drv_data { - struct s3c24xx_uart_info *info; + struct s3c24xx_uart_info info; struct s3c2410_uartcfg *def_cfg; unsigned int fifosize[CONFIG_SERIAL_SAMSUNG_UARTS]; }; @@ -2197,7 +2197,7 @@ static int s3c24xx_serial_probe(struct platform_devic= e *pdev) } =20 ourport->baudclk =3D ERR_PTR(-EINVAL); - ourport->info =3D ourport->drv_data->info; + ourport->info =3D &ourport->drv_data->info; ourport->cfg =3D (dev_get_platdata(&pdev->dev)) ? dev_get_platdata(&pdev->dev) : ourport->drv_data->def_cfg; @@ -2616,7 +2616,7 @@ static struct console s3c24xx_serial_console =3D { =20 #ifdef CONFIG_CPU_S3C2410 static struct s3c24xx_serial_drv_data s3c2410_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C2410 UART", .type =3D TYPE_S3C24XX, .port_type =3D PORT_S3C2410, @@ -2644,7 +2644,7 @@ static struct s3c24xx_serial_drv_data s3c2410_serial_= drv_data =3D { =20 #ifdef CONFIG_CPU_S3C2412 static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C2412 UART", .type =3D TYPE_S3C24XX, .port_type =3D PORT_S3C2412, @@ -2674,7 +2674,7 @@ static struct s3c24xx_serial_drv_data s3c2412_serial_= drv_data =3D { #if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \ defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2442) static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C2440 UART", .type =3D TYPE_S3C24XX, .port_type =3D PORT_S3C2440, @@ -2704,7 +2704,7 @@ static struct s3c24xx_serial_drv_data s3c2440_serial_= drv_data =3D { =20 #if defined(CONFIG_CPU_S3C6400) || defined(CONFIG_CPU_S3C6410) static struct s3c24xx_serial_drv_data s3c6400_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C6400 UART", .type =3D TYPE_S3C6400, .port_type =3D PORT_S3C6400, @@ -2733,7 +2733,7 @@ static struct s3c24xx_serial_drv_data s3c6400_serial_= drv_data =3D { =20 #ifdef CONFIG_CPU_S5PV210 static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S5PV210 UART", .type =3D TYPE_S3C6400, .port_type =3D PORT_S3C6400, @@ -2762,7 +2762,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_= drv_data =3D { =20 #if defined(CONFIG_ARCH_EXYNOS) #define EXYNOS_COMMON_SERIAL_DRV_DATA() \ - .info =3D &(struct s3c24xx_uart_info) { \ + .info =3D { \ .name =3D "Samsung Exynos UART", \ .type =3D TYPE_S3C6400, \ .port_type =3D PORT_S3C6400, \ @@ -2811,7 +2811,7 @@ static struct s3c24xx_serial_drv_data exynos850_seria= l_drv_data =3D { =20 #ifdef CONFIG_ARCH_APPLE static struct s3c24xx_serial_drv_data s5l_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Apple S5L UART", .type =3D TYPE_APPLE_S5L, .port_type =3D PORT_8250, --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 23533C433F5 for ; Mon, 7 Mar 2022 08:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236081AbiCGIJ4 (ORCPT ); Mon, 7 Mar 2022 03:09:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236069AbiCGIJx (ORCPT ); Mon, 7 Mar 2022 03:09:53 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CE121BE81 for ; Mon, 7 Mar 2022 00:08:59 -0800 (PST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 240C23F605 for ; Mon, 7 Mar 2022 08:08:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640537; bh=eR7Mc9vi/w7iGpwa309YiCzl9zkdxojESdgSBLZGEv4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LCYw9LR02HlXPdwP+3ZrOyrR6ROD6a+t+6G7Xfk21TSR7F+Cn1c2qhz2FI6Coxk3n aPeeQLsYQih2aJaqWLkTEV/uqtOVykfnUj674bFOTtzoUWGr3TDawOe8pbXD/X+9cg 4H4H98Fwa6ysuatFo5To85a117moSKx4ruwOMZLsqWiQ7NoL/oBxtD5axYR338d/Dm B5J2jHAwLhNPHuLBzYHS/b1HNC+fdflt/ttAqBPuVISL/r7o9H5sAxxalZ9Qgq28lX fGzZsRxKAjitMc2oN1MgnLD5CZBvDyZehOpwOx93h0eXfafScILNzk7bvn29D0Aw+T MJhp4GGM/BRJg== Received: by mail-ej1-f69.google.com with SMTP id d7-20020a1709061f4700b006bbf73a7becso6598502ejk.17 for ; Mon, 07 Mar 2022 00:08:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eR7Mc9vi/w7iGpwa309YiCzl9zkdxojESdgSBLZGEv4=; b=lHMKhOujP0Jju4pGjbgMrOTbohyKj6pbkQe8cIL0uewVIfni5HkYlKPbBrvvQwufRM d8O9lF+nv6TvI2Nk/PtCm+2+y1iISC/EjgerPicDStK1oOBVInnUrcOSFagxkt6CtNx3 KRxqX/NcTuwOlQcBsevXd1twuYpaZSNIwT+eA0uj3LtSpQY2P4nC/L9vrW6JlhYqz0t+ 6Oo1ea5ezEzeD1Ia+hIuW7Kc5bfg2elNEQG3DCtWE3JPsZ40nBEm/S3asBlv26JLMRj5 fvC0wWABpYNlx83OaAMO/ejQgI39w3GLF9wluOWi3eDVDgeZPB8PAeKKjFyaHXU7NOu5 +iXg== X-Gm-Message-State: AOAM532tVsvQdWhQKAgBVtDCN/LNcl1SjcxQMTlK2qWpfldUheR59g15 1bx/kkb9Tv1zG/L/H5i4nQkZh5W7wVuwwNPp82szuXDyjtgT5FMXmELcQBfiyVg7jeIbBy+JqKl FxnooSRSBCbXOL2IxXERpMy4pbD98OXlXM6rrkOqjNA== X-Received: by 2002:a17:907:d06:b0:6da:2902:e9ad with SMTP id gn6-20020a1709070d0600b006da2902e9admr8377711ejc.566.1646640535810; Mon, 07 Mar 2022 00:08:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJxCbsSDsaeQ5A3m0lusAuFH7GkNNgJvj5FHMB6/pMQ6cGRuCsKahqtP+fbfKW0QoSgQklboFw== X-Received: by 2002:a17:907:d06:b0:6da:2902:e9ad with SMTP id gn6-20020a1709070d0600b006da2902e9admr8377700ejc.566.1646640535645; Mon, 07 Mar 2022 00:08:55 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id s21-20020a170906961500b006daac87ddb0sm3698300ejx.140.2022.03.07.00.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:08:55 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/7] tty: serial: samsung: embed s3c24xx_uart_info in parent structure Date: Mon, 7 Mar 2022 09:08:46 +0100 Message-Id: <20220307080852.53992-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" Embed "struct s3c24xx_uart_info" directly as a member of "struct s3c24xx_serial_drv_data" instead of keeping it as a pointer. This makes the code clearer (obvious ownership of "struct s3c24xx_serial_drv_data") and saves one pointer. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jiri Slaby Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index d002a4e48ed9..aa5678d03704 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -85,7 +85,7 @@ struct s3c24xx_uart_info { }; =20 struct s3c24xx_serial_drv_data { - struct s3c24xx_uart_info *info; + struct s3c24xx_uart_info info; struct s3c2410_uartcfg *def_cfg; unsigned int fifosize[CONFIG_SERIAL_SAMSUNG_UARTS]; }; @@ -2197,7 +2197,7 @@ static int s3c24xx_serial_probe(struct platform_devic= e *pdev) } =20 ourport->baudclk =3D ERR_PTR(-EINVAL); - ourport->info =3D ourport->drv_data->info; + ourport->info =3D &ourport->drv_data->info; ourport->cfg =3D (dev_get_platdata(&pdev->dev)) ? dev_get_platdata(&pdev->dev) : ourport->drv_data->def_cfg; @@ -2616,7 +2616,7 @@ static struct console s3c24xx_serial_console =3D { =20 #ifdef CONFIG_CPU_S3C2410 static struct s3c24xx_serial_drv_data s3c2410_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C2410 UART", .type =3D TYPE_S3C24XX, .port_type =3D PORT_S3C2410, @@ -2644,7 +2644,7 @@ static struct s3c24xx_serial_drv_data s3c2410_serial_= drv_data =3D { =20 #ifdef CONFIG_CPU_S3C2412 static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C2412 UART", .type =3D TYPE_S3C24XX, .port_type =3D PORT_S3C2412, @@ -2674,7 +2674,7 @@ static struct s3c24xx_serial_drv_data s3c2412_serial_= drv_data =3D { #if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \ defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2442) static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C2440 UART", .type =3D TYPE_S3C24XX, .port_type =3D PORT_S3C2440, @@ -2704,7 +2704,7 @@ static struct s3c24xx_serial_drv_data s3c2440_serial_= drv_data =3D { =20 #if defined(CONFIG_CPU_S3C6400) || defined(CONFIG_CPU_S3C6410) static struct s3c24xx_serial_drv_data s3c6400_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S3C6400 UART", .type =3D TYPE_S3C6400, .port_type =3D PORT_S3C6400, @@ -2733,7 +2733,7 @@ static struct s3c24xx_serial_drv_data s3c6400_serial_= drv_data =3D { =20 #ifdef CONFIG_CPU_S5PV210 static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Samsung S5PV210 UART", .type =3D TYPE_S3C6400, .port_type =3D PORT_S3C6400, @@ -2762,7 +2762,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_= drv_data =3D { =20 #if defined(CONFIG_ARCH_EXYNOS) #define EXYNOS_COMMON_SERIAL_DRV_DATA() \ - .info =3D &(struct s3c24xx_uart_info) { \ + .info =3D { \ .name =3D "Samsung Exynos UART", \ .type =3D TYPE_S3C6400, \ .port_type =3D PORT_S3C6400, \ @@ -2811,7 +2811,7 @@ static struct s3c24xx_serial_drv_data exynos850_seria= l_drv_data =3D { =20 #ifdef CONFIG_ARCH_APPLE static struct s3c24xx_serial_drv_data s5l_serial_drv_data =3D { - .info =3D &(struct s3c24xx_uart_info) { + .info =3D { .name =3D "Apple S5L UART", .type =3D TYPE_APPLE_S5L, .port_type =3D PORT_8250, --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 7C959C433F5 for ; Mon, 7 Mar 2022 08:09:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236096AbiCGIK1 (ORCPT ); Mon, 7 Mar 2022 03:10:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236082AbiCGIKX (ORCPT ); Mon, 7 Mar 2022 03:10:23 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B8234968B for ; Mon, 7 Mar 2022 00:09:29 -0800 (PST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 260A53F1E6 for ; Mon, 7 Mar 2022 08:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640568; bh=Hr6l7tR8wCFPpDLdPVRbiwm0w/8EJx3zWKyr1VFg4Q4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VFDZZetJDBZau1NmMUCvSxLHT0eviZWktWgjEPXu0LN6trKjHRXBNM9FuYPyeJ+4h WoVazzxc9u6838sLO84mUe4mu3WYLjiFYtOBYP711MyGqlBl8ByGpmZfvjmKzm68Oh 9AnKd6fPKY71puJSnDtDfSijkWZDTgLRhKSy/jnWu7My25YdoM8lRtbw0MCo/2Df+Y b7ffC07nhDjeRkXeGcT6fgM0niQKvR4EEAsmG7NL+/qTms5Cd2/6mdNo0gyf7mAERb +4U7YT0Mz+Rtb3StZq019z9UznjEP/IhjNoBOvIZPpsOpZREDHb/SV0wBbUpy5DX43 VZEwGvV93jp2A== Received: by mail-ed1-f72.google.com with SMTP id e10-20020a056402190a00b00410f20467abso8141010edz.14 for ; Mon, 07 Mar 2022 00:09:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hr6l7tR8wCFPpDLdPVRbiwm0w/8EJx3zWKyr1VFg4Q4=; b=Q5WTKDu50WxSZX2W5qLpnfqRrnAff7/7+M35yHvJ8n/zhxJJRXrODtolw8YeqarOae +8ycNTRhECPav0oij5Qw/qng+C/7GopyafnoaWY/iXI+2IlvtWs0umK56iwvhOFU1czA VMXBV+anrTlD+eq45QwiJS7yhmUvqhcwXQSm91g2cIX/iaHHqZ9voRfEAYBqjkT0BjgA hm1miFldYJ9PUorT/HSS+6Ktt7/KXKvvhyfe8u8xM0MLty1uNFXs83WuXS0qeXC7myHC 3xQN7eY/j5c3xMn5x2rHyeJ4kx/0R/hJYzkvSdhTuaK09vufxheb2mev3EGwxR9k94jF vafQ== X-Gm-Message-State: AOAM530DlJ5mdZH5mhu1t1ucmxjMCq/tJEynxKE0EQH7pQO1NdV4GCR6 y0LCj04po2NPQ+wTYw8I31zuS9JAwin3rnUL9wnGjc1Ehfh6n7Th2+gvheSz8UyBwisHdjfBYBw NOWxojXxioIBoXId1qQ4FM8WhoWo4naFrcQIDEaWuPA== X-Received: by 2002:aa7:db07:0:b0:415:d33e:a8ea with SMTP id t7-20020aa7db07000000b00415d33ea8eamr9897827eds.342.1646640567893; Mon, 07 Mar 2022 00:09:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNaH7lGnyROX1lQxu8WqlZ1+w74vQK+Ouvk0dc1jxOnopJEO9Ambl+7Snfxcdo3gz4WsL+eg== X-Received: by 2002:aa7:db07:0:b0:415:d33e:a8ea with SMTP id t7-20020aa7db07000000b00415d33ea8eamr9897806eds.342.1646640567675; Mon, 07 Mar 2022 00:09:27 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fq14-20020a1709069d8e00b006da650af5a9sm4472594ejc.3.2022.03.07.00.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:09:27 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/7] tty: serial: samsung: embed s3c2410_uartcfg in parent structure Date: Mon, 7 Mar 2022 09:09:20 +0100 Message-Id: <20220307080925.54131-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" Embed "struct s3c2410_uartcfg" directly as a member of "struct s3c24xx_serial_drv_data" instead of keeping it as a pointer. This makes the code clearer (obvious ownership of "s3c2410_uartcfg s3c24xx_serial_drv_data") and saves one pointer. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jiri Slaby Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index aa5678d03704..a9a75b5b9705 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -86,7 +86,7 @@ struct s3c24xx_uart_info { =20 struct s3c24xx_serial_drv_data { struct s3c24xx_uart_info info; - struct s3c2410_uartcfg *def_cfg; + struct s3c2410_uartcfg def_cfg; unsigned int fifosize[CONFIG_SERIAL_SAMSUNG_UARTS]; }; =20 @@ -2200,7 +2200,7 @@ static int s3c24xx_serial_probe(struct platform_devic= e *pdev) ourport->info =3D &ourport->drv_data->info; ourport->cfg =3D (dev_get_platdata(&pdev->dev)) ? dev_get_platdata(&pdev->dev) : - ourport->drv_data->def_cfg; + &ourport->drv_data->def_cfg; =20 switch (ourport->info->type) { case TYPE_S3C24XX: @@ -2632,7 +2632,7 @@ static struct s3c24xx_serial_drv_data s3c2410_serial_= drv_data =3D { .clksel_mask =3D S3C2410_UCON_CLKMASK, .clksel_shift =3D S3C2410_UCON_CLKSHIFT, }, - .def_cfg =3D &(struct s3c2410_uartcfg) { + .def_cfg =3D { .ucon =3D S3C2410_UCON_DEFAULT, .ufcon =3D S3C2410_UFCON_DEFAULT, }, @@ -2661,7 +2661,7 @@ static struct s3c24xx_serial_drv_data s3c2412_serial_= drv_data =3D { .clksel_mask =3D S3C2412_UCON_CLKMASK, .clksel_shift =3D S3C2412_UCON_CLKSHIFT, }, - .def_cfg =3D &(struct s3c2410_uartcfg) { + .def_cfg =3D { .ucon =3D S3C2410_UCON_DEFAULT, .ufcon =3D S3C2410_UFCON_DEFAULT, }, @@ -2692,7 +2692,7 @@ static struct s3c24xx_serial_drv_data s3c2440_serial_= drv_data =3D { .clksel_shift =3D S3C2412_UCON_CLKSHIFT, .ucon_mask =3D S3C2440_UCON0_DIVMASK, }, - .def_cfg =3D &(struct s3c2410_uartcfg) { + .def_cfg =3D { .ucon =3D S3C2410_UCON_DEFAULT, .ufcon =3D S3C2410_UFCON_DEFAULT, }, @@ -2721,7 +2721,7 @@ static struct s3c24xx_serial_drv_data s3c6400_serial_= drv_data =3D { .clksel_mask =3D S3C6400_UCON_CLKMASK, .clksel_shift =3D S3C6400_UCON_CLKSHIFT, }, - .def_cfg =3D &(struct s3c2410_uartcfg) { + .def_cfg =3D { .ucon =3D S3C2410_UCON_DEFAULT, .ufcon =3D S3C2410_UFCON_DEFAULT, }, @@ -2749,7 +2749,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_= drv_data =3D { .clksel_mask =3D S5PV210_UCON_CLKMASK, .clksel_shift =3D S5PV210_UCON_CLKSHIFT, }, - .def_cfg =3D &(struct s3c2410_uartcfg) { + .def_cfg =3D { .ucon =3D S5PV210_UCON_DEFAULT, .ufcon =3D S5PV210_UFCON_DEFAULT, }, @@ -2778,7 +2778,7 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_= drv_data =3D { .clksel_mask =3D 0, \ .clksel_shift =3D 0, \ }, \ - .def_cfg =3D &(struct s3c2410_uartcfg) { \ + .def_cfg =3D { \ .ucon =3D S5PV210_UCON_DEFAULT, \ .ufcon =3D S5PV210_UFCON_DEFAULT, \ .has_fracval =3D 1, \ @@ -2827,7 +2827,7 @@ static struct s3c24xx_serial_drv_data s5l_serial_drv_= data =3D { .clksel_mask =3D 0, .clksel_shift =3D 0, }, - .def_cfg =3D &(struct s3c2410_uartcfg) { + .def_cfg =3D { .ucon =3D APPLE_S5L_UCON_DEFAULT, .ufcon =3D S3C2410_UFCON_DEFAULT, }, --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 773D8C433EF for ; Mon, 7 Mar 2022 08:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236109AbiCGIKi (ORCPT ); Mon, 7 Mar 2022 03:10:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236100AbiCGIK2 (ORCPT ); Mon, 7 Mar 2022 03:10:28 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FF3B4B1FA for ; Mon, 7 Mar 2022 00:09:33 -0800 (PST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id CF0433F1AF for ; Mon, 7 Mar 2022 08:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640570; bh=VfU6rg+3m76TXZN+oNBMBb/R38BcJuX1TlC4U+bbsI8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rD8aIJ4uQjBX6hzUZukA3zW7qOtwbcSExm+BFbCz1ljmk5MLwhSpIs/OTt5aZi780 tmJwNWWBhqTe7nD3Vu/Go0GzRwiSqxYchN7ij5NviQyRKnqIMjkRB597ud8c7W5C3Y PrdNL50kSvFLiAMEHovc/lz0Yzkw18G/LUZbHfqvtAnuzFzLndSa0m52ZKbZwpVEOz nFKm4lbYRwECYNzhAQEALD1EGbD9OMqsrMH7nN6RoZaqz+mZ4S9dog1GOdPS9Jp0GJ KO/IFpFv0p9QVcjlkuQqCkhKhb4bcrRYqPQ+1Lr7mD4J1pDi9s4u/P8yP+UoChjd9F BXxMv0/mwZ/kQ== Received: by mail-ej1-f71.google.com with SMTP id h22-20020a1709060f5600b006b11a2d3dcfso6611566ejj.4 for ; Mon, 07 Mar 2022 00:09:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VfU6rg+3m76TXZN+oNBMBb/R38BcJuX1TlC4U+bbsI8=; b=zTwiqOnpM56qega+zgDRioJYlKh180xh8kbeqES95KBXLXathPPMzc/v3eFc36VBOg H2X0epuqCgK7etO+WYOJtg4WZr8uZJu1+ZhueYMEXwYXQPGwakzAiyAQDUZELD63mW4k 57plYrdOsvlp7vGUmWi7hfo0Xy81IsnQ5WdTiL5CT171EIUxzicUEufcc0LznWdd/WgF MLwVh164IxvWsSnAEjgBGNdBz6E9+4LjM4wrmcVqeYljze5qxkhq/EhPuKP2HOk4p7ow EALCpJ3e2B7kHw5rYFfsNh5FgHLWmXbAXUvZY/9XIWb7OpFEJlDoWzwPwOmxYjxIdAsv DPVA== X-Gm-Message-State: AOAM532hw8dI4xAVKm6ZrofPKzgXjSIH2+oMRLBdaS4rSVyKgxaxJViD scUT3Ye31QRQXSuzFMHfOchD7LjJZwTd9niKpHJOvFd6Bn01vvanzNbVXrqKf8maC7YapulLHmB cHRQxveHl7IBKPeI0jp1cESV8KaAp0qy4JJv2vqE3IQ== X-Received: by 2002:a17:907:72c1:b0:6da:b844:3dd5 with SMTP id du1-20020a17090772c100b006dab8443dd5mr7985784ejc.244.1646640569330; Mon, 07 Mar 2022 00:09:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtdFZvbk0wQoNXUaQolDmbS4d6fdrpe2cdRnUdGyElVakkLE9BktRO7Vin4U5+6zELPrlTNw== X-Received: by 2002:a17:907:72c1:b0:6da:b844:3dd5 with SMTP id du1-20020a17090772c100b006dab8443dd5mr7985775ejc.244.1646640569089; Mon, 07 Mar 2022 00:09:29 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fq14-20020a1709069d8e00b006da650af5a9sm4472594ejc.3.2022.03.07.00.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:09:28 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/7] tty: serial: samsung: constify s3c24xx_serial_drv_data Date: Mon, 7 Mar 2022 09:09:21 +0100 Message-Id: <20220307080925.54131-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" The driver data (struct s3c24xx_serial_drv_data) is only used to initialize the driver properly and is not modified. Make it const. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 130 +++++++++++++++---------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index a9a75b5b9705..c4b13f2d6e26 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -136,14 +136,14 @@ struct s3c24xx_uart_port { unsigned int tx_mode; unsigned int rx_mode; =20 - struct s3c24xx_uart_info *info; + const struct s3c24xx_uart_info *info; struct clk *clk; struct clk *baudclk; struct uart_port port; - struct s3c24xx_serial_drv_data *drv_data; + const struct s3c24xx_serial_drv_data *drv_data; =20 /* reference to platform data */ - struct s3c2410_uartcfg *cfg; + const struct s3c2410_uartcfg *cfg; =20 struct s3c24xx_uart_dma *dma; =20 @@ -221,7 +221,7 @@ static inline void s3c24xx_clear_bit(struct uart_port *= port, int idx, local_irq_restore(flags); } =20 -static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) +static inline struct s3c24xx_uart_port *to_ourport(const struct uart_port = *port) { return container_of(port, struct s3c24xx_uart_port, port); } @@ -573,13 +573,13 @@ static void s3c24xx_serial_stop_rx(struct uart_port *= port) } } =20 -static inline struct s3c24xx_uart_info +static inline const struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port) { return to_ourport(port)->info; } =20 -static inline struct s3c2410_uartcfg +static inline const struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port) { struct s3c24xx_uart_port *ourport; @@ -594,7 +594,7 @@ static inline struct s3c2410_uartcfg static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport, unsigned long ufstat) { - struct s3c24xx_uart_info *info =3D ourport->info; + const struct s3c24xx_uart_info *info =3D ourport->info; =20 if (ufstat & info->rx_fifofull) return ourport->port.fifosize; @@ -986,7 +986,7 @@ static irqreturn_t apple_serial_handle_irq(int irq, voi= d *id) =20 static unsigned int s3c24xx_serial_tx_empty(struct uart_port *port) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); unsigned long ufstat =3D rd_regl(port, S3C2410_UFSTAT); unsigned long ufcon =3D rd_regl(port, S3C2410_UFCON); =20 @@ -1405,7 +1405,7 @@ static void s3c24xx_serial_pm(struct uart_port *port,= unsigned int level, =20 static inline int s3c24xx_serial_getsource(struct uart_port *port) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); unsigned int ucon; =20 if (info->num_clks =3D=3D 1) @@ -1419,7 +1419,7 @@ static inline int s3c24xx_serial_getsource(struct uar= t_port *port) static void s3c24xx_serial_setsource(struct uart_port *port, unsigned int clk_sel) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); unsigned int ucon; =20 if (info->num_clks =3D=3D 1) @@ -1438,7 +1438,7 @@ static unsigned int s3c24xx_serial_getclk(struct s3c2= 4xx_uart_port *ourport, unsigned int req_baud, struct clk **best_clk, unsigned int *clk_num) { - struct s3c24xx_uart_info *info =3D ourport->info; + const struct s3c24xx_uart_info *info =3D ourport->info; struct clk *clk; unsigned long rate; unsigned int cnt, baud, quot, best_quot =3D 0; @@ -1522,7 +1522,7 @@ static void s3c24xx_serial_set_termios(struct uart_po= rt *port, struct ktermios *termios, struct ktermios *old) { - struct s3c2410_uartcfg *cfg =3D s3c24xx_port_to_cfg(port); + const struct s3c2410_uartcfg *cfg =3D s3c24xx_port_to_cfg(port); struct s3c24xx_uart_port *ourport =3D to_ourport(port); struct clk *clk =3D ERR_PTR(-EINVAL); unsigned long flags; @@ -1691,7 +1691,7 @@ static const char *s3c24xx_serial_type(struct uart_po= rt *port) =20 static void s3c24xx_serial_config_port(struct uart_port *port, int flags) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); =20 if (flags & UART_CONFIG_TYPE) port->type =3D info->port_type; @@ -1703,7 +1703,7 @@ static void s3c24xx_serial_config_port(struct uart_po= rt *port, int flags) static int s3c24xx_serial_verify_port(struct uart_port *port, struct serial_struct *s= er) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); =20 if (ser->type !=3D PORT_UNKNOWN && ser->type !=3D info->port_type) return -EINVAL; @@ -1873,9 +1873,9 @@ s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS] =3D= { */ =20 static void s3c24xx_serial_resetport(struct uart_port *port, - struct s3c2410_uartcfg *cfg) + const struct s3c2410_uartcfg *cfg) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); unsigned long ucon =3D rd_regl(port, S3C2410_UCON); =20 ucon &=3D (info->clksel_mask | info->ucon_mask); @@ -1979,7 +1979,7 @@ s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart= _port *port) static int s3c24xx_serial_enable_baudclk(struct s3c24xx_uart_port *ourport) { struct device *dev =3D ourport->port.dev; - struct s3c24xx_uart_info *info =3D ourport->info; + const struct s3c24xx_uart_info *info =3D ourport->info; char clk_name[MAX_CLK_NAME_LENGTH]; unsigned int clk_sel; struct clk *clk; @@ -2021,7 +2021,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_ua= rt_port *ourport, struct platform_device *platdev) { struct uart_port *port =3D &ourport->port; - struct s3c2410_uartcfg *cfg =3D ourport->cfg; + const struct s3c2410_uartcfg *cfg =3D ourport->cfg; struct resource *res; int ret; =20 @@ -2156,7 +2156,7 @@ static const struct of_device_id s3c24xx_uart_dt_matc= h[]; =20 static int probe_index; =20 -static inline struct s3c24xx_serial_drv_data * +static inline const struct s3c24xx_serial_drv_data * s3c24xx_get_driver_data(struct platform_device *pdev) { #ifdef CONFIG_OF @@ -2419,7 +2419,7 @@ static struct uart_port *cons_uart; static int s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon) { - struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); + const struct s3c24xx_uart_info *info =3D s3c24xx_port_to_info(port); unsigned long ufstat, utrstat; =20 if (ufcon & S3C2410_UFCON_FIFOMODE) { @@ -2615,7 +2615,7 @@ static struct console s3c24xx_serial_console =3D { #endif /* CONFIG_SERIAL_SAMSUNG_CONSOLE */ =20 #ifdef CONFIG_CPU_S3C2410 -static struct s3c24xx_serial_drv_data s3c2410_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data s3c2410_serial_drv_data =3D { .info =3D { .name =3D "Samsung S3C2410 UART", .type =3D TYPE_S3C24XX, @@ -2637,13 +2637,13 @@ static struct s3c24xx_serial_drv_data s3c2410_seria= l_drv_data =3D { .ufcon =3D S3C2410_UFCON_DEFAULT, }, }; -#define S3C2410_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2410_serial_drv_data) +#define S3C2410_SERIAL_DRV_DATA (&s3c2410_serial_drv_data) #else -#define S3C2410_SERIAL_DRV_DATA (kernel_ulong_t)NULL +#define S3C2410_SERIAL_DRV_DATA NULL #endif =20 #ifdef CONFIG_CPU_S3C2412 -static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data s3c2412_serial_drv_data =3D { .info =3D { .name =3D "Samsung S3C2412 UART", .type =3D TYPE_S3C24XX, @@ -2666,14 +2666,14 @@ static struct s3c24xx_serial_drv_data s3c2412_seria= l_drv_data =3D { .ufcon =3D S3C2410_UFCON_DEFAULT, }, }; -#define S3C2412_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2412_serial_drv_data) +#define S3C2412_SERIAL_DRV_DATA (&s3c2412_serial_drv_data) #else -#define S3C2412_SERIAL_DRV_DATA (kernel_ulong_t)NULL +#define S3C2412_SERIAL_DRV_DATA NULL #endif =20 #if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \ defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2442) -static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data s3c2440_serial_drv_data =3D { .info =3D { .name =3D "Samsung S3C2440 UART", .type =3D TYPE_S3C24XX, @@ -2697,13 +2697,13 @@ static struct s3c24xx_serial_drv_data s3c2440_seria= l_drv_data =3D { .ufcon =3D S3C2410_UFCON_DEFAULT, }, }; -#define S3C2440_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2440_serial_drv_data) +#define S3C2440_SERIAL_DRV_DATA (&s3c2440_serial_drv_data) #else -#define S3C2440_SERIAL_DRV_DATA (kernel_ulong_t)NULL +#define S3C2440_SERIAL_DRV_DATA NULL #endif =20 #if defined(CONFIG_CPU_S3C6400) || defined(CONFIG_CPU_S3C6410) -static struct s3c24xx_serial_drv_data s3c6400_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data s3c6400_serial_drv_data =3D { .info =3D { .name =3D "Samsung S3C6400 UART", .type =3D TYPE_S3C6400, @@ -2726,13 +2726,13 @@ static struct s3c24xx_serial_drv_data s3c6400_seria= l_drv_data =3D { .ufcon =3D S3C2410_UFCON_DEFAULT, }, }; -#define S3C6400_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c6400_serial_drv_data) +#define S3C6400_SERIAL_DRV_DATA (&s3c6400_serial_drv_data) #else -#define S3C6400_SERIAL_DRV_DATA (kernel_ulong_t)NULL +#define S3C6400_SERIAL_DRV_DATA NULL #endif =20 #ifdef CONFIG_CPU_S5PV210 -static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data s5pv210_serial_drv_data =3D { .info =3D { .name =3D "Samsung S5PV210 UART", .type =3D TYPE_S3C6400, @@ -2755,9 +2755,9 @@ static struct s3c24xx_serial_drv_data s5pv210_serial_= drv_data =3D { }, .fifosize =3D { 256, 64, 16, 16 }, }; -#define S5PV210_SERIAL_DRV_DATA ((kernel_ulong_t)&s5pv210_serial_drv_data) +#define S5PV210_SERIAL_DRV_DATA (&s5pv210_serial_drv_data) #else -#define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL +#define S5PV210_SERIAL_DRV_DATA NULL #endif =20 #if defined(CONFIG_ARCH_EXYNOS) @@ -2784,33 +2784,33 @@ static struct s3c24xx_serial_drv_data s5pv210_seria= l_drv_data =3D { .has_fracval =3D 1, \ } \ =20 -static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data exynos4210_serial_drv_data =3D= { EXYNOS_COMMON_SERIAL_DRV_DATA(), .fifosize =3D { 256, 64, 16, 16 }, }; =20 -static struct s3c24xx_serial_drv_data exynos5433_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data exynos5433_serial_drv_data =3D= { EXYNOS_COMMON_SERIAL_DRV_DATA(), .fifosize =3D { 64, 256, 16, 256 }, }; =20 -static struct s3c24xx_serial_drv_data exynos850_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data exynos850_serial_drv_data =3D { EXYNOS_COMMON_SERIAL_DRV_DATA(), .fifosize =3D { 256, 64, 64, 64 }, }; =20 -#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos4210_serial_drv= _data) -#define EXYNOS5433_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos5433_serial_drv= _data) -#define EXYNOS850_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos850_serial_drv_d= ata) +#define EXYNOS4210_SERIAL_DRV_DATA (&exynos4210_serial_drv_data) +#define EXYNOS5433_SERIAL_DRV_DATA (&exynos5433_serial_drv_data) +#define EXYNOS850_SERIAL_DRV_DATA (&exynos850_serial_drv_data) =20 #else -#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)NULL) -#define EXYNOS5433_SERIAL_DRV_DATA ((kernel_ulong_t)NULL) -#define EXYNOS850_SERIAL_DRV_DATA ((kernel_ulong_t)NULL) +#define EXYNOS4210_SERIAL_DRV_DATA NULL +#define EXYNOS5433_SERIAL_DRV_DATA NULL +#define EXYNOS850_SERIAL_DRV_DATA NULL #endif =20 #ifdef CONFIG_ARCH_APPLE -static struct s3c24xx_serial_drv_data s5l_serial_drv_data =3D { +static const struct s3c24xx_serial_drv_data s5l_serial_drv_data =3D { .info =3D { .name =3D "Apple S5L UART", .type =3D TYPE_APPLE_S5L, @@ -2832,39 +2832,39 @@ static struct s3c24xx_serial_drv_data s5l_serial_dr= v_data =3D { .ufcon =3D S3C2410_UFCON_DEFAULT, }, }; -#define S5L_SERIAL_DRV_DATA ((kernel_ulong_t)&s5l_serial_drv_data) +#define S5L_SERIAL_DRV_DATA (&s5l_serial_drv_data) #else -#define S5L_SERIAL_DRV_DATA ((kernel_ulong_t)NULL) +#define S5L_SERIAL_DRV_DATA NULL #endif =20 static const struct platform_device_id s3c24xx_serial_driver_ids[] =3D { { .name =3D "s3c2410-uart", - .driver_data =3D S3C2410_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)S3C2410_SERIAL_DRV_DATA, }, { .name =3D "s3c2412-uart", - .driver_data =3D S3C2412_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)S3C2412_SERIAL_DRV_DATA, }, { .name =3D "s3c2440-uart", - .driver_data =3D S3C2440_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)S3C2440_SERIAL_DRV_DATA, }, { .name =3D "s3c6400-uart", - .driver_data =3D S3C6400_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)S3C6400_SERIAL_DRV_DATA, }, { .name =3D "s5pv210-uart", - .driver_data =3D S5PV210_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)S5PV210_SERIAL_DRV_DATA, }, { .name =3D "exynos4210-uart", - .driver_data =3D EXYNOS4210_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)EXYNOS4210_SERIAL_DRV_DATA, }, { .name =3D "exynos5433-uart", - .driver_data =3D EXYNOS5433_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)EXYNOS5433_SERIAL_DRV_DATA, }, { .name =3D "s5l-uart", - .driver_data =3D S5L_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)S5L_SERIAL_DRV_DATA, }, { .name =3D "exynos850-uart", - .driver_data =3D EXYNOS850_SERIAL_DRV_DATA, + .driver_data =3D (kernel_ulong_t)EXYNOS850_SERIAL_DRV_DATA, }, { }, }; @@ -2873,23 +2873,23 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_serial_driver= _ids); #ifdef CONFIG_OF static const struct of_device_id s3c24xx_uart_dt_match[] =3D { { .compatible =3D "samsung,s3c2410-uart", - .data =3D (void *)S3C2410_SERIAL_DRV_DATA }, + .data =3D S3C2410_SERIAL_DRV_DATA }, { .compatible =3D "samsung,s3c2412-uart", - .data =3D (void *)S3C2412_SERIAL_DRV_DATA }, + .data =3D S3C2412_SERIAL_DRV_DATA }, { .compatible =3D "samsung,s3c2440-uart", - .data =3D (void *)S3C2440_SERIAL_DRV_DATA }, + .data =3D S3C2440_SERIAL_DRV_DATA }, { .compatible =3D "samsung,s3c6400-uart", - .data =3D (void *)S3C6400_SERIAL_DRV_DATA }, + .data =3D S3C6400_SERIAL_DRV_DATA }, { .compatible =3D "samsung,s5pv210-uart", - .data =3D (void *)S5PV210_SERIAL_DRV_DATA }, + .data =3D S5PV210_SERIAL_DRV_DATA }, { .compatible =3D "samsung,exynos4210-uart", - .data =3D (void *)EXYNOS4210_SERIAL_DRV_DATA }, + .data =3D EXYNOS4210_SERIAL_DRV_DATA }, { .compatible =3D "samsung,exynos5433-uart", - .data =3D (void *)EXYNOS5433_SERIAL_DRV_DATA }, + .data =3D EXYNOS5433_SERIAL_DRV_DATA }, { .compatible =3D "apple,s5l-uart", - .data =3D (void *)S5L_SERIAL_DRV_DATA }, + .data =3D S5L_SERIAL_DRV_DATA }, { .compatible =3D "samsung,exynos850-uart", - .data =3D (void *)EXYNOS850_SERIAL_DRV_DATA }, + .data =3D EXYNOS850_SERIAL_DRV_DATA }, {}, }; MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match); --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 65DEEC4332F for ; Mon, 7 Mar 2022 08:09:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236107AbiCGIKa (ORCPT ); Mon, 7 Mar 2022 03:10:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236095AbiCGIK0 (ORCPT ); Mon, 7 Mar 2022 03:10:26 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22F3F4B1C2 for ; Mon, 7 Mar 2022 00:09:33 -0800 (PST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 154223F1E6 for ; Mon, 7 Mar 2022 08:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640571; bh=4HAGUFdmLrEMxU9EFzkJe4Ux3HcmnFK/yDcsBQCmOjM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ar7fL9ueWOkRzUtFITgzBX2E5qX8D4HHFnO0EhcVYoKY2xzlzhEnCJwswfxASZ+eK GF78AwOEvxtIbPS3jVwi7DyDd9m/7wRLKuyUgPLqlv5rGkl6yB4FnWQNWETmLaIq9o WXYa0hUHZ/YELlvXrSOcICQjLU2TydVoUWXL5IeUmLesykOzbLK4NwkO786BZahSue PG4PTemQUUTyTGE0JRMGqBsa+cpI0Uny97us1EtoYbUjL+RLdOO91l8NSXlr97yZU1 C+Dq/Rxf3Usc/fxk067AMiHAeXBAsCIdhqHMDm6e7b8rj4NnqyFp3gW8Fg0Ak7+MgS JZYcw465OHyfg== Received: by mail-ed1-f70.google.com with SMTP id e10-20020a056402190a00b00410f20467abso8141083edz.14 for ; Mon, 07 Mar 2022 00:09:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4HAGUFdmLrEMxU9EFzkJe4Ux3HcmnFK/yDcsBQCmOjM=; b=IwsamsJmAuu2JLQJUtP+G/2dTg8N4w7tgJho1GYtfh1e/ABgm5JEXV7HapadTMoJkT CVEqlL44Lg/wdMGGx7sHjSxjTDrdAm4P8EBhkTF3bXruij64mdUQRu+MtWiBfGtpR1mC TchQcjoHH2RftbKXDaEabUz8W7pixXG+SxB8lvt0ZjjGJQU2fLwJ9Z2rpJVuA1xsrlOe yQ2cMkrpAMvpNvpZcaPw+SeRqAgsvuMgeCpS3rdR6vp7HB7J6oQ/lXt5a3y1XXzZjLLF 7eWaMtZvpEdR+x1vHWqeajSv3kQ6e4AhKuqEWo3iFRw6stLlJ02Vx2ci0b7sie6BWJsd NqYA== X-Gm-Message-State: AOAM532DVZATZVv5uW87WUqTPlLREJITX+1zPVYF/Wdj+xqbdfkuc6Ec UOrqzncc81SbSO2A48lOry0ErHm+QO0TDelBmFMmpLL9Nbu/uJrdMwFIrSl4nIDtYv0iSMBP7gZ O/mii80dmxyfQUN0JhAp0tltnHdjZqERXhd3AVNLBBw== X-Received: by 2002:a05:6402:18:b0:410:86cd:9dce with SMTP id d24-20020a056402001800b0041086cd9dcemr9810252edu.70.1646640570856; Mon, 07 Mar 2022 00:09:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgU+c7KFSylijaRWQXv0cNRe/wpPkgSFLwallIr6sdnzfiO44fulIE699j1F9ifcnE8L0KOA== X-Received: by 2002:a05:6402:18:b0:410:86cd:9dce with SMTP id d24-20020a056402001800b0041086cd9dcemr9810243edu.70.1646640570665; Mon, 07 Mar 2022 00:09:30 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fq14-20020a1709069d8e00b006da650af5a9sm4472594ejc.3.2022.03.07.00.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:09:29 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] tty: serial: samsung: constify UART name Date: Mon, 7 Mar 2022 09:09:22 +0100 Message-Id: <20220307080925.54131-3-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" The UART name from driver data holds only string literals. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jiri Slaby Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index c4b13f2d6e26..7025306f76b7 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -63,7 +63,7 @@ enum s3c24xx_port_type { }; =20 struct s3c24xx_uart_info { - char *name; + const char *name; enum s3c24xx_port_type type; unsigned int port_type; unsigned int fifosize; --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 3614DC433F5 for ; Mon, 7 Mar 2022 08:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236114AbiCGIKv (ORCPT ); Mon, 7 Mar 2022 03:10:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236112AbiCGIKb (ORCPT ); Mon, 7 Mar 2022 03:10:31 -0500 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D8584D24E for ; Mon, 7 Mar 2022 00:09:37 -0800 (PST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id BCAA93F61B for ; Mon, 7 Mar 2022 08:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640573; bh=kV9bWky3aqex0YOWejd45KPzqFNsCZcNjbYJT0yjx5k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RQphjHQJmXBAx8OeYX3OY6E4zyOjEy4PMuiTtFe9MtP6VCgrOaAkK0apjKxRO7F7m K7BmT9MdmXicq9yhv0zszOqSmESNTkEaUonfd3E9yTFDBO/wwWnLiOuh+uydgdycSl IWYvNCP/ksnjlqLXFz6hipklyLKAr1QAXGOom/GhpbS1yzdShup3re0/4i9epK7snC eHZ0slxKAOjPmYX0xj8aqJ2Op8sEtILpBkxkDcqy5Ie8qBz7qD2cWaGH66e3/hi4I5 40jzuA0yuQIucLROu97t2utbpOIUpMrWrogbQhua8zJG5Q9MdGN56JkpKvpN5eCIIO TQa0rPmVzbDUQ== Received: by mail-ed1-f72.google.com with SMTP id l24-20020a056402231800b00410f19a3103so8158455eda.5 for ; Mon, 07 Mar 2022 00:09:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kV9bWky3aqex0YOWejd45KPzqFNsCZcNjbYJT0yjx5k=; b=P+M6S9iMqxHJZ2KXz6US48ZFayh56yYgGw5fsTXzWdNsZNjnUbZHEoR0he3V4LzZFp thY+fGlrQGBD5DJp3PMmZpqt1B9S6Q8dA/s85z0cJ8+k3OoccRztvr9/qHYXIEv/wTo6 JXmfOMuCgis8jiK7A/ejXww8URSJDF/xo7b3bjDykKUtCBsTVwRChgQIKp8Gs+KnREaE 5AmCHe/3aD4Ie8IkeerMDym0jwEdhctbRQ8cyBRqmV5RdakKjNmRxdBk80e5oBVllR+p qgEAVUYpbt7eSnw3/cXSZ0o/JcZ/qhCoXp6yDk7lcXVVAfNlADL4EFOfJWW1E4IVurDL 81zA== X-Gm-Message-State: AOAM533aRwAvrLwNUgsYZsDxCUpyJWSblhoZp8pyr3qxjbSeo7c1t1XB ggAFvFxgwHjCHHHnqddK/bd8qduUrAEU2zv1/DhyoX+QDoGr3pvk4wwHAAIWhju1/JPRZSv53ak yIOvmCKRrY0DN+DQJAFBjWzSLbDBkMrkto8ilHxpIhQ== X-Received: by 2002:a17:907:9956:b0:6cf:cd25:c5a7 with SMTP id kl22-20020a170907995600b006cfcd25c5a7mr7978723ejc.635.1646640572156; Mon, 07 Mar 2022 00:09:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwu85jkg65tIPk5L9NKONVRpMHiBi3IKZigN9L3D0ZJ8f0joA64x28uwWQqTpa7qj5dJKGMqw== X-Received: by 2002:a17:907:9956:b0:6cf:cd25:c5a7 with SMTP id kl22-20020a170907995600b006cfcd25c5a7mr7978714ejc.635.1646640572014; Mon, 07 Mar 2022 00:09:32 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fq14-20020a1709069d8e00b006da650af5a9sm4472594ejc.3.2022.03.07.00.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:09:31 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] tty: serial: samsung: constify s3c24xx_serial_drv_data members Date: Mon, 7 Mar 2022 09:09:23 +0100 Message-Id: <20220307080925.54131-4-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" The driver data (struct s3c24xx_serial_drv_data) is never modified, so also its members can be made const. Except code style this has no impact because the structure itself is always a const. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jiri Slaby Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index 7025306f76b7..b9783d8fb440 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -85,9 +85,9 @@ struct s3c24xx_uart_info { }; =20 struct s3c24xx_serial_drv_data { - struct s3c24xx_uart_info info; - struct s3c2410_uartcfg def_cfg; - unsigned int fifosize[CONFIG_SERIAL_SAMSUNG_UARTS]; + const struct s3c24xx_uart_info info; + const struct s3c2410_uartcfg def_cfg; + const unsigned int fifosize[CONFIG_SERIAL_SAMSUNG_UARTS]; }; =20 struct s3c24xx_uart_dma { --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 63081C433EF for ; Mon, 7 Mar 2022 08:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236129AbiCGIKq (ORCPT ); Mon, 7 Mar 2022 03:10:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236110AbiCGIKb (ORCPT ); Mon, 7 Mar 2022 03:10:31 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBBD14BB9E for ; Mon, 7 Mar 2022 00:09:36 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8F0DF3F223 for ; Mon, 7 Mar 2022 08:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640574; bh=h6f9aBRuD6q6vAjPoDeH1HVvyeu4tZHUHi6lgSytsOc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GHUm6EZwNhvNRuXBVYSgyEUpitDEdD2q2eDjjVfnriF+er10b/ICWsg5sXe1z2/Lv IpigH8XQZwR8DA5QfPWBziAt9LIAjZqIStyloUw5RyNUf7Udax3hM5vEZMeUCh0LaS SkpNBfToB5jj+3nr9576yK7glQAufAtz89fDTzukahaciQSk/PH79h+LWV6VAELgiQ XUlcEPvt1ZzKr9hpL5P5hVm1t43aO2OxSTRDjx6Zs7zr0D/sTk3NBqefAqs2AmOBPv WPbGy/y4IkDvuKWKuFh81tQ3Fb14aQw8YcWpDkJES1k2so28zJRZML3fPxJ+1TsLUS 8TcPxn3XrVK7Q== Received: by mail-ed1-f71.google.com with SMTP id u28-20020a50d51c000000b004159ffb8f24so8170800edi.4 for ; Mon, 07 Mar 2022 00:09:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h6f9aBRuD6q6vAjPoDeH1HVvyeu4tZHUHi6lgSytsOc=; b=W1kf2bfCulkv2+0HwGLjPUMDngh6F95GfNTazrX0+otn8meNy2npuXRv0DxEWbNgX1 p7k/iMKTDe8j6jKZmL8hq/u+32zdHoWvZKqqsZ67mdeDA5MGqRxi9BZLSiX+NZk+zkfr Ea6bb2FIP3YpAmxtmMOMU766ZnvKCytRNPkpgumKG3TyYjg9Zfm9It+e32LjICIqATOy JodYZOdiPTWAko1ZexW93GnlGHT1UDjbu5ayfxbssR9cKbZADiruasNMjUWXcOvlaLTt JHskR5xY0nEz+zydJNPQYm/eH6HRckCf2iVVYOoN99is4LJ9SrjxT1QzE0LJZjrvg8OF CWqw== X-Gm-Message-State: AOAM531t30lDcQvRf0A6HwgeZz5yFGZkXNQvDpKaZj+gno9zjJQVgH5d +Y7r4rTCOhbvYv9hqqcStjc+RYVrBafBf6u8az84CHg8HyMmufAGMKiznkh1gNFBcahBka9+Weo EMhg7Bw9OKcVdorpAFef+3rI3O5CxMhBTBP4avbItrg== X-Received: by 2002:a17:906:1158:b0:6d0:562b:d8ee with SMTP id i24-20020a170906115800b006d0562bd8eemr8318850eja.78.1646640573844; Mon, 07 Mar 2022 00:09:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJFERfDAzIzSbz/jjP+nZrQWV1hE6APZaomrEaakxaIYDNfhbNIVLeDnfdSIfagKkLTgaiSg== X-Received: by 2002:a17:906:1158:b0:6d0:562b:d8ee with SMTP id i24-20020a170906115800b006d0562bd8eemr8318840eja.78.1646640573600; Mon, 07 Mar 2022 00:09:33 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fq14-20020a1709069d8e00b006da650af5a9sm4472594ejc.3.2022.03.07.00.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:09:32 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/7] tty: serial: samsung: constify variables and pointers Date: Mon, 7 Mar 2022 09:09:24 +0100 Message-Id: <20220307080925.54131-5-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" Constify variables, data pointed by several pointers and "udivslot_table" static array. This makes code a bit safer. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Jiri Slaby Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index b9783d8fb440..3ffae912217c 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -164,7 +164,7 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart= _port *ourport); #define portaddrl(port, reg) \ ((unsigned long *)(unsigned long)((port)->membase + (reg))) =20 -static u32 rd_reg(struct uart_port *port, u32 reg) +static u32 rd_reg(const struct uart_port *port, u32 reg) { switch (port->iotype) { case UPIO_MEM: @@ -179,7 +179,7 @@ static u32 rd_reg(struct uart_port *port, u32 reg) =20 #define rd_regl(port, reg) (readl_relaxed(portaddr(port, reg))) =20 -static void wr_reg(struct uart_port *port, u32 reg, u32 val) +static void wr_reg(const struct uart_port *port, u32 reg, u32 val) { switch (port->iotype) { case UPIO_MEM: @@ -195,7 +195,7 @@ static void wr_reg(struct uart_port *port, u32 reg, u32= val) =20 /* Byte-order aware bit setting/clearing functions. */ =20 -static inline void s3c24xx_set_bit(struct uart_port *port, int idx, +static inline void s3c24xx_set_bit(const struct uart_port *port, int idx, unsigned int reg) { unsigned long flags; @@ -208,7 +208,7 @@ static inline void s3c24xx_set_bit(struct uart_port *po= rt, int idx, local_irq_restore(flags); } =20 -static inline void s3c24xx_clear_bit(struct uart_port *port, int idx, +static inline void s3c24xx_clear_bit(const struct uart_port *port, int idx, unsigned int reg) { unsigned long flags; @@ -221,19 +221,19 @@ static inline void s3c24xx_clear_bit(struct uart_port= *port, int idx, local_irq_restore(flags); } =20 -static inline struct s3c24xx_uart_port *to_ourport(const struct uart_port = *port) +static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) { return container_of(port, struct s3c24xx_uart_port, port); } =20 /* translate a port to the device name */ =20 -static inline const char *s3c24xx_serial_portname(struct uart_port *port) +static inline const char *s3c24xx_serial_portname(const struct uart_port *= port) { return to_platform_device(port->dev)->name; } =20 -static int s3c24xx_serial_txempty_nofifo(struct uart_port *port) +static int s3c24xx_serial_txempty_nofifo(const struct uart_port *port) { return rd_regl(port, S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXE; } @@ -358,7 +358,7 @@ static void s3c24xx_serial_tx_dma_complete(void *args) =20 static void enable_tx_dma(struct s3c24xx_uart_port *ourport) { - struct uart_port *port =3D &ourport->port; + const struct uart_port *port =3D &ourport->port; u32 ucon; =20 /* Mask Tx interrupt */ @@ -387,7 +387,7 @@ static void enable_tx_dma(struct s3c24xx_uart_port *our= port) =20 static void enable_tx_pio(struct s3c24xx_uart_port *ourport) { - struct uart_port *port =3D &ourport->port; + const struct uart_port *port =3D &ourport->port; u32 ucon, ufcon; =20 /* Set ufcon txtrig */ @@ -580,9 +580,9 @@ static inline const struct s3c24xx_uart_info } =20 static inline const struct s3c2410_uartcfg - *s3c24xx_port_to_cfg(struct uart_port *port) + *s3c24xx_port_to_cfg(const struct uart_port *port) { - struct s3c24xx_uart_port *ourport; + const struct s3c24xx_uart_port *ourport; =20 if (port->dev =3D=3D NULL) return NULL; @@ -591,7 +591,7 @@ static inline const struct s3c2410_uartcfg return ourport->cfg; } =20 -static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport, +static int s3c24xx_serial_rx_fifocnt(const struct s3c24xx_uart_port *ourpo= rt, unsigned long ufstat) { const struct s3c24xx_uart_info *info =3D ourport->info; @@ -947,8 +947,8 @@ static irqreturn_t s3c24xx_serial_tx_irq(int irq, void = *id) /* interrupt handler for s3c64xx and later SoC's.*/ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id) { - struct s3c24xx_uart_port *ourport =3D id; - struct uart_port *port =3D &ourport->port; + const struct s3c24xx_uart_port *ourport =3D id; + const struct uart_port *port =3D &ourport->port; unsigned int pend =3D rd_regl(port, S3C64XX_UINTP); irqreturn_t ret =3D IRQ_HANDLED; =20 @@ -966,8 +966,8 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, v= oid *id) /* interrupt handler for Apple SoC's.*/ static irqreturn_t apple_serial_handle_irq(int irq, void *id) { - struct s3c24xx_uart_port *ourport =3D id; - struct uart_port *port =3D &ourport->port; + const struct s3c24xx_uart_port *ourport =3D id; + const struct uart_port *port =3D &ourport->port; unsigned int pend =3D rd_regl(port, S3C2410_UTRSTAT); irqreturn_t ret =3D IRQ_NONE; =20 @@ -1499,7 +1499,7 @@ static unsigned int s3c24xx_serial_getclk(struct s3c2= 4xx_uart_port *ourport, * This table takes the fractional value of the baud divisor and gives * the recommended setting for the UDIVSLOT register. */ -static u16 udivslot_table[16] =3D { +static const u16 udivslot_table[16] =3D { [0] =3D 0x0000, [1] =3D 0x0080, [2] =3D 0x0808, @@ -1675,7 +1675,7 @@ static void s3c24xx_serial_set_termios(struct uart_po= rt *port, =20 static const char *s3c24xx_serial_type(struct uart_port *port) { - struct s3c24xx_uart_port *ourport =3D to_ourport(port); + const struct s3c24xx_uart_port *ourport =3D to_ourport(port); =20 switch (ourport->info->type) { case TYPE_S3C24XX: @@ -2450,7 +2450,7 @@ s3c24xx_port_configured(unsigned int ucon) =20 static int s3c24xx_serial_get_poll_char(struct uart_port *port) { - struct s3c24xx_uart_port *ourport =3D to_ourport(port); + const struct s3c24xx_uart_port *ourport =3D to_ourport(port); unsigned int ufstat; =20 ufstat =3D rd_regl(port, S3C2410_UFSTAT); @@ -2935,7 +2935,7 @@ module_exit(samsung_serial_exit); * Early console. */ =20 -static void wr_reg_barrier(struct uart_port *port, u32 reg, u32 val) +static void wr_reg_barrier(const struct uart_port *port, u32 reg, u32 val) { switch (port->iotype) { case UPIO_MEM: @@ -2951,15 +2951,15 @@ struct samsung_early_console_data { u32 txfull_mask; }; =20 -static void samsung_early_busyuart(struct uart_port *port) +static void samsung_early_busyuart(const struct uart_port *port) { while (!(readl(port->membase + S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXFE)) ; } =20 -static void samsung_early_busyuart_fifo(struct uart_port *port) +static void samsung_early_busyuart_fifo(const struct uart_port *port) { - struct samsung_early_console_data *data =3D port->private_data; + const struct samsung_early_console_data *data =3D port->private_data; =20 while (readl(port->membase + S3C2410_UFSTAT) & data->txfull_mask) ; --=20 2.32.0 From nobody Tue Jun 23 11:16:48 2026 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 16459C433F5 for ; Mon, 7 Mar 2022 08:10:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236183AbiCGIKz (ORCPT ); Mon, 7 Mar 2022 03:10:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236113AbiCGIKb (ORCPT ); Mon, 7 Mar 2022 03:10:31 -0500 Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 922494D603 for ; Mon, 7 Mar 2022 00:09:37 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 54B7A3F5FE for ; Mon, 7 Mar 2022 08:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646640576; bh=qtWe8unaq2gnuH4T5GX8K7Uz0Sk1ucH1nG+ntQuiss8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vCZaSo1HP8djnJ+LH5Lx3pkLoOhvUtkLFtEDhFoQ5cKORlhX/0N0fWBvLTIzq8rgM gPqo6Nbdjd4lABJS06JS61XylDcav1BzryOvPEOjsQD5lA8zVF4NKlC7K2rPdnz4Su mxVC1nKbsKlBTBxU1BS3vuOO1f40y9bMt7mWU7tTf8wJJDSrYIrOQ3fOGQhGoD+8f4 z+caJltrlKf8jXuIbhjETqcC/kNe26g/ao0nqyQD6n0osFVmhxyouHQjOScUs9aWJ+ lbz/ZSusQVGWtv8pDaSCt5G6bevUIo3ZaelC7CSv8JOpQLqTmRcIp8sDQ+AFf2wnJV 0siCYGTsbhWgQ== Received: by mail-ed1-f71.google.com with SMTP id x5-20020a50ba85000000b004161d68ace6so3038959ede.15 for ; Mon, 07 Mar 2022 00:09:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qtWe8unaq2gnuH4T5GX8K7Uz0Sk1ucH1nG+ntQuiss8=; b=tAZVmHe7GVeGOYl62RbJgpPV5wQzEkO0nqTW2srQWUh3748b9BTxy9sDHWLnSOE0+2 ejWR+hd0XvsFpoZhRy6gzlxtrbXAEiGdO1nYbc8gI+QoIA9v9qjAb8Lm9RBHqdx7iZkg ESeL6ypPBFV+DpGZrIw6SAfXw+SJ1mSOAt7XbKLRrg2PMwaloknzIsWVXBX0O7ZOQGho 4tCj9L+AXGXOhJL670Efqw7kZl7V/KlGoPYvHzsPGuDocTVV3X1iWChVkcAgCpOec1Q8 OEe9Gd7MvJWAUarDtx5hIhSx1ctX5mTYBxNtk0u9tu36mmGlO+qTbME5tsuKFEJmQv2p nsbg== X-Gm-Message-State: AOAM531M60RnoVyT2RzLdPnnv0d/J2R5xLWY6U+dEKx8tqZ0qnBnVhNK F0yi4WLrIpzxJQ5XqdWUzU0LMwb3cGguhMSKjyG+9bQYClai8QmCD+dk1tXdwjmOYut95ZDSjMy WR9thpE3gvMPSAsoxdqQmmEhSXnjUBJvHZXpuYiJgNA== X-Received: by 2002:a50:9505:0:b0:416:4496:5ec4 with SMTP id u5-20020a509505000000b0041644965ec4mr4323946eda.309.1646640575280; Mon, 07 Mar 2022 00:09:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2xIp5JRTTzEh0b9kN02MCecpWBHOKgNZ/2vrmHcEo1ZMQRcV8NeBt353n0K2lxOS7+4TSFw== X-Received: by 2002:a50:9505:0:b0:416:4496:5ec4 with SMTP id u5-20020a509505000000b0041644965ec4mr4323929eda.309.1646640575081; Mon, 07 Mar 2022 00:09:35 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-174-239.adslplus.ch. [188.155.174.239]) by smtp.gmail.com with ESMTPSA id fq14-20020a1709069d8e00b006da650af5a9sm4472594ejc.3.2022.03.07.00.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 00:09:34 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/7] tty: serial: samsung: simplify getting OF match data Date: Mon, 7 Mar 2022 09:09:25 +0100 Message-Id: <20220307080925.54131-6-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> References: <20220307080810.53847-1-krzysztof.kozlowski@canonical.com> 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" Simplify the code with of_device_get_match_data(). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Alim Akhtar Tested-by: Alim Akhtar --- drivers/tty/serial/samsung_tty.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_= tty.c index 3ffae912217c..61c530bb377f 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -2150,23 +2150,16 @@ static int s3c24xx_serial_init_port(struct s3c24xx_= uart_port *ourport, =20 /* Device driver serial port probe */ =20 -#ifdef CONFIG_OF -static const struct of_device_id s3c24xx_uart_dt_match[]; -#endif - static int probe_index; =20 static inline const struct s3c24xx_serial_drv_data * s3c24xx_get_driver_data(struct platform_device *pdev) { #ifdef CONFIG_OF - if (pdev->dev.of_node) { - const struct of_device_id *match; - - match =3D of_match_node(s3c24xx_uart_dt_match, pdev->dev.of_node); - return (struct s3c24xx_serial_drv_data *)match->data; - } + if (pdev->dev.of_node) + return of_device_get_match_data(&pdev->dev); #endif + return (struct s3c24xx_serial_drv_data *) platform_get_device_id(pdev)->driver_data; } --=20 2.32.0