From patchwork Fri Mar 21 18:20:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875466 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 1B8A222E406; Fri, 21 Mar 2025 18:21:30 +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=1742581291; cv=none; b=LPVSNVFL+JF1T7ikA4LOrX+Tso/DKwJB+CmHQfP7GVhhfqU/LnGpNrlDEi6icvKgcqf7TAfuh/iQOFuN83kG4GkaMPVCn6+5WT4Ok4FndtxqVAn9cv0bNOv2dzYhv0rKHguI1MEHrCDMYhhhOjxbCmCkNiWvmEk4tEEuorwULNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581291; c=relaxed/simple; bh=Z11NZgntq6KJfRIsKInfFfPgwQUCX5OufzcP3Pi8Gb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E0Bj3Y3PI2bV8VL+5BuB5R8Wg77v/pdOw9gR3kcEmzFBAqqkHmYd/saSsZ+AwYwZDPTyhEqFDs7fzSa8b6pMYtrV1aPT8WSpqUh5bqhMHibp4DEu6BeCY+QqWyyBM9jRU4L1l7Iww2VA/pdimq6RarcLxA/dmUxmU1rpGJJpk58= 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=HvpgrQwV; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HvpgrQwV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581290; x=1774117290; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z11NZgntq6KJfRIsKInfFfPgwQUCX5OufzcP3Pi8Gb0=; b=HvpgrQwVwJ828i64RE6qjXIipRpiZHG6lIh1apfw3z1P6i/gBFTKw1f/ yNMVmRPPt2+fzqMFZMo12IR1rm2LSNr3EahkJOyB5g1/EEM7mFar84caX ITAZPP44hrZL6DUylAk7z8mjv7/2tEhM8+xcc88wyOCk3zUxMmPhbs+kF MtU3S8V1VmwhJEDNVS8ikapUGZIp8skGwOMoPsbJe1DvdZ+9Sx5MoSKFN i2Kn+QbLzUqAHBh5L4EBitbVGx2U35cDO9Fr4xKjuq08xn5gfqucJ+X2u mFUNyO1E5RJ+hlnSb8MJxUCZir0iu7j8c/khho7a+8uTVXu9/XjxNM3+j w==; X-CSE-ConnectionGUID: ePQfS3q6TLKqq2+XZ4Iz5w== X-CSE-MsgGUID: TsDttR0bTRyjVnNkBbSJJw== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="69212010" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="69212010" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:28 -0700 X-CSE-ConnectionGUID: H5I1NIKBRiefnbE5OVVBOQ== X-CSE-MsgGUID: YkYHpO/aSZmnHaG5L0+3Hg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="124423521" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa008.jf.intel.com with ESMTP; 21 Mar 2025 11:21:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id ADCD0AF; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 1/7] serial: 8250_ni: Switch to use uart_read_port_properties() Date: Fri, 21 Mar 2025 20:20:12 +0200 Message-ID: <20250321182119.454507-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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_ni.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index b10a42d2ad63..03e838f440be 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -285,7 +285,6 @@ static int ni16550_probe(struct platform_device *pdev) const char *portmode; bool rs232_property; int ret; - int irq; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -293,10 +292,6 @@ static int ni16550_probe(struct platform_device *pdev) spin_lock_init(&uart.port.lock); - irq = platform_get_irq(pdev, 0); - if (irq < 0) - return irq; - ret = ni16550_get_regs(pdev, &uart.port); if (ret < 0) return ret; @@ -307,10 +302,7 @@ static int ni16550_probe(struct platform_device *pdev) info = device_get_match_data(dev); uart.port.dev = dev; - uart.port.irq = irq; - uart.port.irqflags = IRQF_SHARED; - uart.port.flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF - | UPF_FIXED_PORT | UPF_FIXED_TYPE; + uart.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_FIXED_TYPE; uart.port.startup = ni16550_port_startup; uart.port.shutdown = ni16550_port_shutdown; @@ -332,12 +324,16 @@ static int ni16550_probe(struct platform_device *pdev) /* * Declaration of the base clock frequency can come from one of: * - static declaration in this driver (for older ACPI IDs) - * - a "clock-frquency" ACPI + * - a "clock-frequency" ACPI */ if (info->uartclk) uart.port.uartclk = info->uartclk; - if (device_property_read_u32(dev, "clock-frequency", - &uart.port.uartclk)) { + + ret = uart_read_port_properties(&uart.port); + if (ret) + return ret; + + if (!uart.port.uartclk) { data->clk = devm_clk_get_enabled(dev, NULL); if (!IS_ERR(data->clk)) uart.port.uartclk = clk_get_rate(data->clk); From patchwork Fri Mar 21 18:20:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875743 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 8970722D7B0; Fri, 21 Mar 2025 18:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581290; cv=none; b=nB6IqQR1HQolB7pCIQKycQWNg664ugGHzLizC7ZwfrZiYa5vxy6DwcmO1yhAfaAG/eWhk1a0Ik1sveobWaVdGKtn/V2VxiEqFQx5bqf1jujtaky5fPN56kCzjvEuoV87L6iZsNWJWeb5hdWLF/j2ybefyVXJBRiTZ9TuZK5JfFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581290; c=relaxed/simple; bh=b7hSK+tLsTrKDr4s5J6R0wfJukC3Y0neukCsiqoG/vA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qXA7XOl3FNurp2jWQ++Bqn0QLY+fCG7IankGB/+H7O1rpg2Jh535FtvfH4yG8/ZTiO3y8qxHv/W4Znd1/Y6osEldXovmcukHVRlk3x4zYfxFeD2GjP/mQW0lzxgOo9cUj/sSZCVPSr3mY+wHOyuGSZxwbE2gObz8ooy/PiBrhiI= 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=ZIvY5MWs; arc=none smtp.client-ip=192.198.163.14 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZIvY5MWs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581288; x=1774117288; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b7hSK+tLsTrKDr4s5J6R0wfJukC3Y0neukCsiqoG/vA=; b=ZIvY5MWsjTwzCJU40OLW9TL/RtI3Ej3siwS90lsh7twqslFYBsFna3UZ JqV8b1XLLDhBOlqMInRK500u4HXZuun9TxfNNLOyC8iaLrHNWfpSGnK18 srCl7OpgFerzRzHdFs034fXQCwreQubHksXJB2THupxDFM92wpTok1K/v rBJBJG+vnuajuTKoKsiCnLicaoAlE4T+erJDi1PsWInYQzXYGxkoCtw6W /CPCbc4nxPUpnDFcsLUEYqo+8orGBfHqT03jy1tBOXxxAP5kRByMAJBXC G0cNUGOY3vl4cfRX/1sAx8GrHgDqSENsK1GnVNLts80GQxwcAQPfIimGj Q==; X-CSE-ConnectionGUID: XNEU8AxWTcm+CDHpBLomkA== X-CSE-MsgGUID: 4nKLR875S9iTtQ/OSQ9E3w== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="44046746" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="44046746" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:28 -0700 X-CSE-ConnectionGUID: X3b8qrLRSP6AT4Ft886ceg== X-CSE-MsgGUID: VEzlbH03RfSpgVgKnbjW1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="123433902" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa010.jf.intel.com with ESMTP; 21 Mar 2025 11:21:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id BAF7225B; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 2/7] serial: 8250_ni: Remove duplicate mapping Date: Fri, 21 Mar 2025 20:20:13 +0200 Message-ID: <20250321182119.454507-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 UPF_IOREMAP is for serial core to map the resource on behalf of the driver. No need to perform this explicitly in the driver. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ni.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index 03e838f440be..562f7f29e209 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -239,11 +239,6 @@ static int ni16550_get_regs(struct platform_device *pdev, port->mapsize = resource_size(regs); port->flags |= UPF_IOREMAP; - port->membase = devm_ioremap(&pdev->dev, port->mapbase, - port->mapsize); - if (!port->membase) - return -ENOMEM; - return 0; } From patchwork Fri Mar 21 18:20:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875465 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 2C98622FE03; Fri, 21 Mar 2025 18:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581292; cv=none; b=kR4TH9Q5aqCTvWvCGKAOWMqzYfEi9aP0RnLAEpr9hG6lu1LJTNruFoMM+81JZZVxzAdSON026YIyipgBpAoYhv4tV2Wg2KgU3O0uEAMG6MUoWRI1IE9JdcWMOLmiwDYoDVn5T4S5d2FTjjdd8xjDFS0sPexmX7R80q3UDaAuXBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581292; c=relaxed/simple; bh=H+LCNSxdQS34wY23ObDHsrVq1Z7QJeoK5FyXJLKhpEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O5OimKedEPju8WcaWseu371ldgodZG2BPbR2/5avB75KC8ZMY6wxv2H3T0YisdFSJrYV+X037/1ugwnAk3mPDVPDOE/ByFKyd0slRBkHhi+f2NgisJuEebt8lD9gLokDfIS9Q15NqI4BATA7bI/BhrGfXNRuR+NK1ezHZC61kuU= 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=MJwUsEcM; arc=none smtp.client-ip=192.198.163.14 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MJwUsEcM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581291; x=1774117291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=H+LCNSxdQS34wY23ObDHsrVq1Z7QJeoK5FyXJLKhpEs=; b=MJwUsEcM149pIcxC+UHZE0yF+xhTuwNhIZePbfG/W+yduu38n4KQfC0m 77rxDVc2aWZLETSvYaM1Lx3wWmSZx61D5335IPp4b/m6APvl0w9OBtbpV aV/k6Jj12C0Q2etP0NBbxlYLaPTkhXATvo1t7ltM1xrRit++lJISBwhkg GxMvCF8Y/oHaWcu1GaDkhTmF3u/OfRuYonRDR+O6+nQloBKGH1+xhZQPQ QzdTb9Skr768tGiCnZnEytqJ6I+4C+Rx+FhGkTM7trgybEEspKTG50owx niQnhdWmx//7qYW0RxP5Mu0YTo8NzQEbKFNHpUobZdbsAH8YTVk4PvXZX A==; X-CSE-ConnectionGUID: v/yIQCDgR2aVkGxRI7DvPg== X-CSE-MsgGUID: MSp8v0uQTxCINxTkG3X+Fw== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="44046755" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="44046755" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:28 -0700 X-CSE-ConnectionGUID: 9VnmNasrQc2t9qgOp11WEg== X-CSE-MsgGUID: KlFagwiEQSW+0puCyLgPHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="123433903" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa010.jf.intel.com with ESMTP; 21 Mar 2025 11:21:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C626D214; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 3/7] serial: 8250_ni: Switch to use platform_get_mem_or_io() Date: Fri, 21 Mar 2025 20:20:14 +0200 Message-ID: <20250321182119.454507-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Switch to use new platform_get_mem_or_io() instead of home grown analogue. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ni.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index 562f7f29e209..2dc510c0a5ef 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -224,26 +224,26 @@ static int ni16550_get_regs(struct platform_device *pdev, { struct resource *regs; - regs = platform_get_resource(pdev, IORESOURCE_IO, 0); - if (regs) { + regs = platform_get_mem_or_io(pdev, 0); + if (!regs) + return dev_err_probe(&pdev->dev, -EINVAL, "no registers defined\n"); + + switch (resource_type(regs)) { + case IORESOURCE_IO: port->iotype = UPIO_PORT; port->iobase = regs->start; return 0; - } - - regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (regs) { + case IORESOURCE_MEM: port->iotype = UPIO_MEM; port->mapbase = regs->start; port->mapsize = resource_size(regs); port->flags |= UPF_IOREMAP; return 0; + default: + return -EINVAL; } - - dev_err(&pdev->dev, "no registers defined\n"); - return -EINVAL; } /* From patchwork Fri Mar 21 18:20:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875742 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 CC90922FDE6; Fri, 21 Mar 2025 18:21:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581292; cv=none; b=BZPXvoIOV/YkUR9x3WtYEwgpqKL7YzRksy7Nc4q69XtS2x/BaM0mpf3npAefgXt3nfutcNe9xGzDLFFm/3dkgZrng4du6vKvP4GIwtKFIkYF7zUVBauTj/iDstgkcIM2xDXxqiojSeUEnyIc+9OlDU4yKBHo3/Z14AmwWceklsc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581292; c=relaxed/simple; bh=jWkJdSq1h2tHx5Zu75tcJ9csvWPk4JmJjyoMbLV9opc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NGJyUKGSLAPer2RcQAHPw9emkOJbwOXbGSI3gzJofdHzwpcTmwPOr0Etgr8Y4/9hdXHC5Zg1hfdaAz/CevX8LVHWDa4QuQHOzoVpBmnGyYXJdUb05fKFaqOyUsqdIeJnfsDAq+/+c/39OCDVRf8E/oSG6pGEj5mJE9XJgvZgAfE= 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=ZaV2MwwL; arc=none smtp.client-ip=192.198.163.14 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ZaV2MwwL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581291; x=1774117291; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jWkJdSq1h2tHx5Zu75tcJ9csvWPk4JmJjyoMbLV9opc=; b=ZaV2MwwLj9yxLAqIvWbkoHS/VK/cSh0JmF25URUZdoIVj16tEIiDGrAr A7WlKbrsqM5UA8Mn22hPfVzSMvm+e+JcvETDGTxMEfz2FWV2rRf2mMjHT 02HKPRzUT4A2kq4hciR9iKzuwxAn0h8UL+qEvkxsZzXxb+ln7q4CCFyR9 rjcJCeTuvots+tSHCEnjT2hB4QQJwKrhWHyBA5aTMCnvJG7JnCzuzXulI 0hKxuTxl5AjJHd7IKSKWJFJxmlzxSlpFu8WIfR9wwRwVoJ6fPhgjU3tHu spkfk6KxGTKbTke+ScJQXTPmcjKMZHJA+koYCDmTtxFV+ikCqBU07ZD9s w==; X-CSE-ConnectionGUID: g8t3RbgkS4WwVoZZPpfhIw== X-CSE-MsgGUID: 1zupwdBwR2SyxSFyl9Rncg== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="44046751" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="44046751" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:28 -0700 X-CSE-ConnectionGUID: elBiN2NrSrqPFBVdHxDOLQ== X-CSE-MsgGUID: ERlD2H01Qi2fZDqe+fdJVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="123433904" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa010.jf.intel.com with ESMTP; 21 Mar 2025 11:21:26 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D5D53663; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 4/7] serial: 8250_ni: Remove unneeded conditionals Date: Fri, 21 Mar 2025 20:20:15 +0200 Message-ID: <20250321182119.454507-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 It doesn't matter if the properties are supplied or not in the struct ni16550_device_info as default in any case is 0. Hence there is no need to check for them being set. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ni.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index 2dc510c0a5ef..8bb8bb7bb4f2 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -275,7 +275,7 @@ static int ni16550_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct uart_8250_port uart = {}; unsigned int txfifosz, rxfifosz; - unsigned int prescaler = 0; + unsigned int prescaler; struct ni16550_data *data; const char *portmode; bool rs232_property; @@ -321,8 +321,7 @@ static int ni16550_probe(struct platform_device *pdev) * - static declaration in this driver (for older ACPI IDs) * - a "clock-frequency" ACPI */ - if (info->uartclk) - uart.port.uartclk = info->uartclk; + uart.port.uartclk = info->uartclk; ret = uart_read_port_properties(&uart.port); if (ret) @@ -340,11 +339,9 @@ static int ni16550_probe(struct platform_device *pdev) goto err; } - if (info->prescaler) - prescaler = info->prescaler; + prescaler = info->prescaler; device_property_read_u32(dev, "clock-prescaler", &prescaler); - - if (prescaler != 0) { + if (prescaler) { uart.port.set_mctrl = ni16550_set_mctrl; ni16550_config_prescaler(&uart, (u8)prescaler); } From patchwork Fri Mar 21 18:20:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875740 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 7FC0423024C; Fri, 21 Mar 2025 18:21:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581294; cv=none; b=Kyg3ZTO2lcVk4Jn7KTO/kJpPqLJ2L4IKHP5lATisuYdzA9rp9DVbUD7U25Luj33Yz74CM+hDAUvZLj6NLGNnLu5HwgyZU2Q402tVj+Qnj5aNRmm+jCk5qLyJCKIICnr0ROJRL8AVPJ6K+VGMTuJRtZxB9mOemr8Blb26qUnkMrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581294; c=relaxed/simple; bh=HfUyjAeNkMQbSIhZ4RNqjqKd/mMVsN76s8xFenDTwr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kqbGALaoIpWQJxIRHFmoDYYATN547rK8FrzrcXyuF12IMpj5l0VSls/aonTDUe1Icd/4MH9rf0LLN2EQ1rAcXXMDy/yFG7VWHxiP/737zYLvhL4EpQDu2tID/BYSOmpCLsSTY2AHe9XThO/qI8+FtJ4gY55Db/fnbtc6RxOqRdg= 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=UkH5W2Oo; arc=none smtp.client-ip=192.198.163.14 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UkH5W2Oo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581292; x=1774117292; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HfUyjAeNkMQbSIhZ4RNqjqKd/mMVsN76s8xFenDTwr0=; b=UkH5W2Oo8J0Yx0jkfsWxBc3zVp27ASxfHhhBZUaqqlDqBHZx2LeNzUcy wBbf8W8qAXHo9BO4tU13BTae0QjsrmLJd3dy/u7CpOgYVUpU5Or29qhcU NvwBXSIa2Zl7D3GKbJ35jq4OFWHv/u4D4eEYn0IS3dYajqLK6ExGENcHG q26wJIDkV+HrRvvxrcFgJxSOh4IctTuUHVfSh/Xp2ERK6pjzRYeOkzRgo WOJ2w1SiPdy+wcxhIhIleu/VTZsn54sFpfxBqBuEXJsU2QNSnXxRmTofb rJTSGW2xob+f6L7BaD67UpECBQ0wSVpOZ3EhFP73nSCek5GVNqv51jcrM g==; X-CSE-ConnectionGUID: CKu4JEBVTdy8ashozaivPQ== X-CSE-MsgGUID: k6doNIWgSwazlat+k3Iukg== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="44046760" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="44046760" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:30 -0700 X-CSE-ConnectionGUID: +KItHubUSdS0t9v3NeifzQ== X-CSE-MsgGUID: Y5zFeKbETmaRpZkww8pfaw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="123433917" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa010.jf.intel.com with ESMTP; 21 Mar 2025 11:21:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id E45AA6D4; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 5/7] serial: 8250_ni: use serial_port_in()/serial_port_out() helpers Date: Fri, 21 Mar 2025 20:20:16 +0200 Message-ID: <20250321182119.454507-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are serial_port_in()/serial_port_out() helpers to be used instead of direct p->serial_in()/p->serial_out(). Use them in various 8250 drivers. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ni.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index 8bb8bb7bb4f2..15bee1b7dc2a 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -90,10 +90,10 @@ static int ni16550_disable_transceivers(struct uart_port *port) { u8 pcr; - pcr = port->serial_in(port, NI16550_PCR_OFFSET); + pcr = serial_port_in(port, NI16550_PCR_OFFSET); pcr &= ~NI16550_PCR_TXVR_ENABLE_BIT; dev_dbg(port->dev, "disable transceivers: write pcr: 0x%02x\n", pcr); - port->serial_out(port, NI16550_PCR_OFFSET, pcr); + serial_port_out(port, NI16550_PCR_OFFSET, pcr); return 0; } @@ -105,7 +105,7 @@ static int ni16550_rs485_config(struct uart_port *port, struct uart_8250_port *up = container_of(port, struct uart_8250_port, port); u8 pcr; - pcr = serial_in(up, NI16550_PCR_OFFSET); + pcr = serial_port_in(port, NI16550_PCR_OFFSET); pcr &= ~NI16550_PCR_WIRE_MODE_MASK; if ((rs485->flags & SER_RS485_MODE_RS422) || @@ -120,7 +120,7 @@ static int ni16550_rs485_config(struct uart_port *port, } dev_dbg(port->dev, "config rs485: write pcr: 0x%02x, acr: %02x\n", pcr, up->acr); - serial_out(up, NI16550_PCR_OFFSET, pcr); + serial_port_out(port, NI16550_PCR_OFFSET, pcr); serial_icr_write(up, UART_ACR, up->acr); return 0; From patchwork Fri Mar 21 18:20:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875741 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 ACC7522FE19; Fri, 21 Mar 2025 18:21:31 +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=1742581293; cv=none; b=rPYgkItTQ22cCGFLoQFJZWPiabWmVcpIkPZbqhobLuEixx64gzmtb6axRLNXkGuxpI70LFO84M2hEp8GjBaIeefL+7mpci11bA0ouje/J8AwIJPBcF+w8qMbeO2GVzfqmDhVxW1wuoNOfUQd7QkgZaHIZOIplHKQsGFrCET1U10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581293; c=relaxed/simple; bh=w2DUIoPyngyX/6SZoDWhQE3sTJrL9S/LPtukMHudnw4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l7xNxbs0TJ2BTiaHfHVNCnuJNbUv2Fy2ZGtXPE25SVZeZg8DltzRM32N8UtjfXbNC97wvZLijhS740DPB9bjIWph5NkhApqU3En7pXh78TNObyhnEoWiY93bkHGCQDMPEGCpS9AuUyocATeoB4u1gzW5PR0SpbW/gOSHwLWqN+I= 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=Y2ruMTJZ; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Y2ruMTJZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581292; x=1774117292; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w2DUIoPyngyX/6SZoDWhQE3sTJrL9S/LPtukMHudnw4=; b=Y2ruMTJZDCvkalFUsS8NH/IO0DAkQnhHydKWPnwhwUxBVz8NNTL1xQ98 xC3JpNjicas8f1Jq/7yP3APOQFanB3MKlkB+ZBlKxL0nKv2PgfND1qX5m 24HTnnNzR3P3y3LzLh1tVvSHjskXqFO757j6Lv+LLHdxPK/OIEd4uj7aw CE+gi0ycSoPC5TM/yvykZJFNlodn1Ej+f2+9S/dlZq/hCZDPsYGQKopej mXxiM8zh0igJ1Pai0+BSMscd118YSYKFpzoWZzGhK75Rq3qsSrA3DOU8q e0/6Z9RPg4RfaJGdEDLvV8FcFYKGB7y3t+U0XNVZhzrTT77cz/ZuZhJVj g==; X-CSE-ConnectionGUID: /bJnXnNSQ7WJEczFOwhERQ== X-CSE-MsgGUID: U8sb3A0dTs2gWx/KFjjjWg== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="69212015" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="69212015" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:30 -0700 X-CSE-ConnectionGUID: au3BhlRXQomwcJVkdC5igw== X-CSE-MsgGUID: uVf9PoQVQjuE7DAYDosxJA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="124423524" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa008.jf.intel.com with ESMTP; 21 Mar 2025 11:21:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EEBD2708; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 6/7] serial: 8250_ni: Switch to use dev_err_probe() Date: Fri, 21 Mar 2025 20:20:17 +0200 Message-ID: <20250321182119.454507-7-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Switch to use dev_err_probe() to simplify the error path and unify a message template. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ni.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index 15bee1b7dc2a..c66bfc56838e 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -333,11 +333,8 @@ static int ni16550_probe(struct platform_device *pdev) uart.port.uartclk = clk_get_rate(data->clk); } - if (!uart.port.uartclk) { - dev_err(dev, "unable to determine clock frequency!\n"); - ret = -ENODEV; - goto err; - } + if (!uart.port.uartclk) + return dev_err_probe(dev, -ENODEV, "unable to determine clock frequency!\n"); prescaler = info->prescaler; device_property_read_u32(dev, "clock-prescaler", &prescaler); @@ -381,14 +378,11 @@ static int ni16550_probe(struct platform_device *pdev) ret = serial8250_register_8250_port(&uart); if (ret < 0) - goto err; + return ret; data->line = ret; platform_set_drvdata(pdev, data); return 0; - -err: - return ret; } static void ni16550_remove(struct platform_device *pdev) From patchwork Fri Mar 21 18:20:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 875464 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 4B33922FF4D; Fri, 21 Mar 2025 18:21:31 +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=1742581293; cv=none; b=UQylimB6CZfTzdcx/VaSWkNvAhs+KJ0ithetx7KS0uCNjHEf94TfOKxvCOEixSKdf55Ji1OTPseWBKCzpZwRdkLu2Xqx6LVoKy+rciYmjpCJDtfEx7pAG+RGY/FFnJt6Svyn63jc1yzpS5Pqz3yIFckWC5ySS50JsuFQCC1npkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742581293; c=relaxed/simple; bh=fkjFFznByDQk57yAw7swZKyh1oSTDF5oWpguUFliF8Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nkLi2iwY4+1Vxu02J5fJnV0gs0zZmK5/vD0rYaeCNCEzkDNnzykQcMcW2DAfJy4eZ5v78N9FxoVr+c/gQAUUmDUVyRcdj8v93KLUg9ul2fYTkTZnwdVKjPo531DH42fKIc9YJL4v/YxHS4tmxEKKemKhilcJB0wOgtvU27DBDAE= 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=YGxmoQYl; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YGxmoQYl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742581292; x=1774117292; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fkjFFznByDQk57yAw7swZKyh1oSTDF5oWpguUFliF8Q=; b=YGxmoQYlSnU1Nqn/HSaMESeGGgwDLaYp1NlrE/uZhSMSofaw510BRk8h 7LsWCtQ18CwikUXKkr3PhkE//xBvjCVWieNiT0StKDXRgN+zP0tuK0ASy bme4jMpjYR5wTqwC4E7MdBPKtq9EyNLTuEq7oxbwVjKXTvnMluly2YsPi Dqxvyp/iysPfDBEFvRSUQJ+hI/yJa7un3QGW+QbFxG6X/nLMI9nFiI1GQ FPM909cCuA7dP4vjsLsk7xV57ORW4yIBoZ+usK6662qtbSInnw1iP9FAP B2jLGMT8FzrnyKiWrmFjuVpedbTQF4OypibV6X9E116vE8lHh3Ba2uaOI g==; X-CSE-ConnectionGUID: saiQK/H+SDCg9lFCP7laNw== X-CSE-MsgGUID: 7XTGZkJEQ62VTiIpLZxqsQ== X-IronPort-AV: E=McAfee;i="6700,10204,11380"; a="69212019" X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="69212019" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 11:21:30 -0700 X-CSE-ConnectionGUID: ozzziGvsQfK3iT6AWnwjxQ== X-CSE-MsgGUID: clLm38LWTUS8mKEJS4ahEg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,265,1736841600"; d="scan'208";a="124423525" Received: from black.fi.intel.com ([10.237.72.28]) by orviesa008.jf.intel.com with ESMTP; 21 Mar 2025 11:21:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0ACB1296; Fri, 21 Mar 2025 20:21:24 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Chaitanya Vadrevu , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH v1 7/7] serial: 8250_ni: Tidy up ACPI ID table Date: Fri, 21 Mar 2025 20:20:18 +0200 Message-ID: <20250321182119.454507-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> References: <20250321182119.454507-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Tidy up ACPI ID table: - drop ACPI_PTR() and hence replace acpi.h with mod_devicetable.h et al. - drop comma in the terminator entry With that done, extend compile test coverage. Signed-off-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_ni.c | 15 +++++++++------ drivers/tty/serial/8250/Kconfig | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/8250/8250_ni.c b/drivers/tty/serial/8250/8250_ni.c index c66bfc56838e..b0e44fb00b3a 100644 --- a/drivers/tty/serial/8250/8250_ni.c +++ b/drivers/tty/serial/8250/8250_ni.c @@ -10,14 +10,18 @@ * Copyright 2012-2023 National Instruments Corporation */ -#include #include +#include +#include #include #include #include +#include #include +#include #include -#include +#include +#include #include "8250.h" @@ -392,7 +396,6 @@ static void ni16550_remove(struct platform_device *pdev) serial8250_unregister_port(data->line); } -#ifdef CONFIG_ACPI /* NI 16550 RS-485 Interface */ static const struct ni16550_device_info nic7750 = { .uartclk = 33333333, @@ -417,20 +420,20 @@ static const struct ni16550_device_info nic7a69 = { .uartclk = 29629629, .prescaler = 0x09, }; + static const struct acpi_device_id ni16550_acpi_match[] = { { "NIC7750", (kernel_ulong_t)&nic7750 }, { "NIC7772", (kernel_ulong_t)&nic7772 }, { "NIC792B", (kernel_ulong_t)&nic792b }, { "NIC7A69", (kernel_ulong_t)&nic7a69 }, - { }, + { } }; MODULE_DEVICE_TABLE(acpi, ni16550_acpi_match); -#endif static struct platform_driver ni16550_driver = { .driver = { .name = "ni16550", - .acpi_match_table = ACPI_PTR(ni16550_acpi_match), + .acpi_match_table = ni16550_acpi_match, }, .probe = ni16550_probe, .remove = ni16550_remove, diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 9be9760886dc..63fedac1bbae 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -565,7 +565,7 @@ config SERIAL_8250_BCM7271 config SERIAL_8250_NI tristate "NI 16550 based serial port" depends on SERIAL_8250 - depends on (X86 && ACPI) || COMPILE_TEST + depends on X86 || COMPILE_TEST help This driver supports the integrated serial ports on National Instruments (NI) controller hardware. This is required for all NI