From patchwork Wed Feb 21 18:31:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 204478 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1339316dyc; Wed, 21 Feb 2024 14:46:46 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUEa/GZJKKsad/oTLb+bh+s2KH45YV2KzYyB1bU/h8F/OpP6rOEIexlGoNSiaUhSSdXHTHQ/FDvjceFu1Ko80Sqt3nrPg== X-Google-Smtp-Source: AGHT+IFz1Cajny4AQ5ZziTC5ZTEiPNP/duqTn9qYqD181KmeNsxGTUwqJEbhzHx4kxc7pFrEzCtQ X-Received: by 2002:a2e:8782:0:b0:2d2:4637:63f with SMTP id n2-20020a2e8782000000b002d24637063fmr3872450lji.45.1708555605918; Wed, 21 Feb 2024 14:46:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708555605; cv=pass; d=google.com; s=arc-20160816; b=PdjKjwvYIhUiZtgQYhtDk11Ca7B04lDQGmQxsn/ySkWhW2kZAxyQSK8MmWHSTPsc9W oUphdwGSenytIZqwl7aRsd/0/RIzi9Yxm8/q04GJZFSxAqA+X19y2HIcOcjiXLYeEjKE uzKoTNbsA7Vv3NTXyPTst17/MeaaePWVoiEsRj3uqo5LTZwivYU1O9FTWGsalz4/WV2H +MBe/QLP3lmdh3ePdURROgTJsA3zcn7UChJaYYd0ZQE1wRkck0OQmpY0JZJMttO9XcAN PD9zN+jod68UdmrbfPedWPBem+QMQCjApuvaT6U/ENHNLXyteCaoA4Ss7YtfMJTq7dDm e1Qw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=VcDu/xNp1DuGBdmDeTn33x13atB/Gwt/r0k8CfBN5CU=; fh=yrE9O525sLNdIXC06sJBIlRUjYfWNm6imQ0cf3A93gQ=; b=uUKpO8r8NauTLPPO1IVHWbYBf2YoMotOUqRBZx3ZqeUYxenHSeeRtiKz3khlkfj581 fLJRyXommnCzx7B7SQdRX5P98jkDIPbkbDwRvAV7T4JS//d4tFjPyfjztK3l1VjQ3tJC 5VEGOwrLfE/kGgRHmwgjFx+RB3NtCHYqxvytLI6KyjqczmPMpIFkLUl69Y4h2Pt6w7e6 hZDo6CIj3ZuRHh8TrbrobdU535ZTYNmgN/9cYuf08A3+Qzpy36VpA1rAYnQBh9e+jWdu +l633BUIAWxnzy2g7D/kooN/GG8KRPOEWJXWOywM56HggZT/0C7+Ns6Ze9iO+eUXoOlr OIHg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AoupT78v; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-75311-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75311-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id bo12-20020a0564020b2c00b00564d24c0b5csi1698956edb.500.2024.02.21.14.46.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 14:46:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75311-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AoupT78v; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-75311-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75311-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 211171F26B41 for ; Wed, 21 Feb 2024 18:37:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4D46B129A69; Wed, 21 Feb 2024 18:35:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="AoupT78v" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (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 C156885632; Wed, 21 Feb 2024 18:35:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708540506; cv=none; b=b+/Lgrn1alRHJjvZeFUhkm7E5vZQgC6Z4qsqHweINXA0F5MfrD4UMpNHqEETlsEUnPSlu4+sReRWb30yxXymezK5iECoGgL01QU+KJ7dCfTeVSqPjR/lwSKEB0fzRYOjZqykZlsgP2WJw6ibNUUcX9AT2Y0J0XfSOjDnpGttmlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708540506; c=relaxed/simple; bh=vhK6pyGf2T+TFWuVP7O7kQnPlVO9Kof9u3xE7jBi6uw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DhSIWQXmcPbu/H+r6jXK4dGy/ga6dFDwhE2cJpX3qAtKtUUyir11mM5OOXZfLDTqcB35jq8nYMqr8Vz0Xjw+rocGOZlQZKRWCmeZyw4UNAktB07kyoXR7ph5dijuus1IcOukrr1AY/qSnGSKvp0JaCZna8Gvbz/0pnZau+rWNRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=AoupT78v; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708540505; x=1740076505; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vhK6pyGf2T+TFWuVP7O7kQnPlVO9Kof9u3xE7jBi6uw=; b=AoupT78v5P5R69wEW23yfZzXXdMidvdv0Fe9IforJba66O/DzgdwAYJB wiupZz0ZMeUEXdccN4degcSiHuELs1PO+EIUrhkRIPnWAoLNdtks9Ilgt EUqOP/4HoMrwM8l/XBUXD3nShvztV4TkgVntdtCx3Fhsyo4k7sZBywF6G Ezq+P0pRqVAmaJmStTW3Lx22jMHG9edrjLJUNAIigj4R6prgA0xBdeN46 TDtupqn6XcSb0UmX4xw8A8USTA+hGjLFxbblm2Qei9fdK6u44Ym0Hkf5/ UMaeReQxpgq7eUybrnC4ln4dNONG5umCQG6E5wDt6jVfqPVj2mRNjqWwL A==; X-IronPort-AV: E=McAfee;i="6600,9927,10991"; a="28164807" X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="28164807" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2024 10:35:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10991"; a="936684753" X-IronPort-AV: E=Sophos;i="6.06,176,1705392000"; d="scan'208";a="936684753" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 21 Feb 2024 10:34:55 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 379154F1; Wed, 21 Feb 2024 20:34:47 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Andy Shevchenko , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-rpi-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Jiri Slaby , Joel Stanley , Andrew Jeffery , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Al Cooper , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Paul Cercueil , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , Kunihiko Hayashi , Masami Hiramatsu Subject: [PATCH v1 08/14] serial: 8250_ingenic: Switch to use uart_read_port_properties() Date: Wed, 21 Feb 2024 20:31:24 +0200 Message-ID: <20240221183442.4124354-9-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240221183442.4124354-1-andriy.shevchenko@linux.intel.com> References: <20240221183442.4124354-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791550402812566170 X-GMAIL-MSGID: 1791550402812566170 Since we have now a common helper to read port properties use it instead of sparse home grown solution. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ingenic.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ingenic.c b/drivers/tty/serial/8250/8250_ingenic.c index a12f737924c0..7603129f1c07 100644 --- a/drivers/tty/serial/8250/8250_ingenic.c +++ b/drivers/tty/serial/8250/8250_ingenic.c @@ -234,7 +234,7 @@ static int ingenic_uart_probe(struct platform_device *pdev) struct ingenic_uart_data *data; const struct ingenic_uart_config *cdata; struct resource *regs; - int irq, err, line; + int err; cdata = of_device_get_match_data(&pdev->dev); if (!cdata) { @@ -242,10 +242,6 @@ static int ingenic_uart_probe(struct platform_device *pdev) return -ENODEV; } - irq = platform_get_irq(pdev, 0); - if (irq < 0) - return irq; - regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!regs) { dev_err(&pdev->dev, "no registers defined\n"); @@ -259,21 +255,19 @@ static int ingenic_uart_probe(struct platform_device *pdev) spin_lock_init(&uart.port.lock); uart.port.type = PORT_16550A; uart.port.flags = UPF_SKIP_TEST | UPF_IOREMAP | UPF_FIXED_TYPE; - uart.port.iotype = UPIO_MEM; uart.port.mapbase = regs->start; - uart.port.regshift = 2; uart.port.serial_out = ingenic_uart_serial_out; uart.port.serial_in = ingenic_uart_serial_in; - uart.port.irq = irq; uart.port.dev = &pdev->dev; - uart.port.fifosize = cdata->fifosize; uart.tx_loadsz = cdata->tx_loadsz; uart.capabilities = UART_CAP_FIFO | UART_CAP_RTOIE; - /* Check for a fixed line number */ - line = of_alias_get_id(pdev->dev.of_node, "serial"); - if (line >= 0) - uart.port.line = line; + err = uart_read_port_properties(&uart.port, true); + if (err) + return err; + + uart.port.regshift = 2; + uart.port.fifosize = cdata->fifosize; uart.port.membase = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));