From patchwork Tue Jul 25 05:42:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 125339 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2266961vqg; Mon, 24 Jul 2023 23:15:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlFvJUM/YeW309hA4rLj7VSxoRNDY5CCPyKY8DzGXZmvcdKrJDFueSryre5IHUKn4+JIeFlL X-Received: by 2002:a25:6a41:0:b0:bcb:9b43:5a89 with SMTP id f62-20020a256a41000000b00bcb9b435a89mr8807869ybc.61.1690265725790; Mon, 24 Jul 2023 23:15:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690265725; cv=none; d=google.com; s=arc-20160816; b=09+NYUD1w8vqae4lC0jvkqtKnV3O9p0Trr67qyUDZbTvrdHkFzRICDqGNjA994hnGt mKvj8rMbMrmApOU/ibvzfBa/ARF7bs/trT54HApa0qx1E+jK76GeA7Bld3ARUfqvxp4j EYJOaYJ2dbxtm6OvGmgW+g+GoI8tOSgxLGbkKNIYqYd/7FTNHQoldg4HxotIEFPoJZPE 7V3hdD32zdMovvbgZmEfJovTS/Yg9yi7PRiVwgNRPXEcblENtDZJqXk+tbrlA0xkMTtm /ROhR4xqjFP61gd1hIC0nU4Npxnmko2TnmAhuMZ2scq330O5R/Tk+ifvpMt0QXV9Tsa2 ob9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Jyk0NXwQflmsvPDxU0faqcC+c+qDlE92mPnWPgdf89o=; fh=wxWR7S7XHVlqVIuoke4G1/IBIqVMAhyap/qryV8BrCQ=; b=cjh/n1VgIWVh14jDaAxdt6mT9m5aPD4l9oYvEJSP4gcSiAGbsqW2FRo7CQecwZ3oW5 8CiIqmHbD5NARtv0Pn89JR0HWozNuzljWnYx9pMhXmxMuYRurocd6OS71Wx6nA2gYCW6 zWtC+cHafeifTDxPYztw2rW3sZsyL6p9M5AKmxrTpfrMZS66lSg9WSC+JzW10TknGsi0 rlDW6UGbNGpZKlZeapyUk178tCth2obF+Alu5xIK0R7M/KLs0xFfuk1ykO0yxUKfFj2R uCnYx/nS5cnIQifnjeY1u98qQsIjYSS/HZXH3/E85swdmxPgwcLLsTk1QO9XjiUnz7uR QTqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r91-20020a17090a43e400b0025690b76c95si10900304pjg.10.2023.07.24.23.15.12; Mon, 24 Jul 2023 23:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231381AbjGYFmm (ORCPT + 99 others); Tue, 25 Jul 2023 01:42:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230164AbjGYFme (ORCPT ); Tue, 25 Jul 2023 01:42:34 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C825419AF; Mon, 24 Jul 2023 22:42:33 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 5593481A0; Tue, 25 Jul 2023 05:42:31 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v5 1/3] serial: core: Controller id cannot be negative Date: Tue, 25 Jul 2023 08:42:10 +0300 Message-ID: <20230725054216.45696-2-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725054216.45696-1-tony@atomide.com> References: <20230725054216.45696-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772372073799084315 X-GMAIL-MSGID: 1772372073799084315 The controller id cannot be negative. Let's fix the ctrl_id in preparation for adding port_id to fix the device name. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Tony Lindgren --- include/linux/serial_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -459,7 +459,7 @@ struct uart_port { struct serial_rs485 *rs485); int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *iso7816); - int ctrl_id; /* optional serial core controller id */ + unsigned int ctrl_id; /* optional serial core controller id */ unsigned int irq; /* irq number */ unsigned long irqflags; /* irq flags */ unsigned int uartclk; /* base uart clock */ From patchwork Tue Jul 25 05:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 125342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2268199vqg; Mon, 24 Jul 2023 23:18:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlFVptr1ZUbLsJFuLZS1mbf4NBh6l1jzkzP2OzSo4rlxZEmWO2LaAO1lgA+Rbvu8Gk/1gB0p X-Received: by 2002:a17:907:7750:b0:992:4250:5462 with SMTP id kx16-20020a170907775000b0099242505462mr11779257ejc.50.1690265923732; Mon, 24 Jul 2023 23:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690265923; cv=none; d=google.com; s=arc-20160816; b=hjD5Jw+UqTwCye5nHC7HPV9Ztm/GaI/jC01wWKR7Xt/PVCYIxeDwsr+ueigSl36BKO /4vyrzf8rcKvZdQ74fjloP/GRbgqqd7LLjeWf1tgN1Gu8ebIbXgM6fe00q517sx3O0At kclxnF5KMgWx5rAwiBDE1KQc3MFrP8CJnoMhn+8I1CTMS10VPumNhUTXQlfbjtDzMkWw NuZ9yfurLTS9wJrIhqV7Ztw8/+OWJDGpmXfLNGRhQaW//V9Q1jiWTsrfgLYzsuQN42wM u2S9BL1fQuGEKN1RzdNwYpTZkHvitr6I6/MhLBNxWRNNFBwx2u5fc0iGk+SQ1HDvZV3J R5yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=7eutRLjZiASJgT9AMIabrw6rRnCqONPj76AlWZEdqOk=; fh=wxWR7S7XHVlqVIuoke4G1/IBIqVMAhyap/qryV8BrCQ=; b=LSL+gPyK/S2eGuL1rZ38RKTgcDgr2bU29sz+ZlAmWxJOBnLoccd6OmfGlGwSicGIVo mya0I54lEQ+qnPkE0JGHhO24LuV2R5VNQxIZm+SuU6cHaQaCoHF7PaHmC9/eQ3BhcrUm 6rZYJ2y1rFzFQj7w43tRRz3jXkVl+Evp3H7bWH/RJM3i45AMIkcxrl/3VUE8y9gMj4iq +YxmpeXEWYK1qC9CL+tJmzdKCFA3RNbLpLc9SiduAgNASXKJ1bix342kspOOvtF5eQCd fo0tmv/DX5Fq2G4+kdgM2bVx1f61CxHhkSO2XWy8T0JFwim/Msu+CMiSzrWyr3SgN4rQ mJJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xo17-20020a170907bb9100b00992aea2c6a6si6968535ejc.977.2023.07.24.23.18.19; Mon, 24 Jul 2023 23:18:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230223AbjGYFmw (ORCPT + 99 others); Tue, 25 Jul 2023 01:42:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231378AbjGYFmm (ORCPT ); Tue, 25 Jul 2023 01:42:42 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AAB821BE7; Mon, 24 Jul 2023 22:42:39 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id CFB1281A1; Tue, 25 Jul 2023 05:42:36 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v5 2/3] serial: core: Fix serial core port id to not use port->line Date: Tue, 25 Jul 2023 08:42:11 +0300 Message-ID: <20230725054216.45696-3-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725054216.45696-1-tony@atomide.com> References: <20230725054216.45696-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772372281577610339 X-GMAIL-MSGID: 1772372281577610339 The serial core port id should be serial core controller specific port instance, which is not always the port->line index. For example, 8250 driver maps a number of legacy ports, and when a hardware specific device driver takes over, we typically have one driver instance for each port. Let's instead add port->port_id to keep track serial ports mapped to each serial core controller instance. Currently this is only a cosmetic issue for the serial core port device names. The issue can be noticed looking at /sys/bus/serial-base/devices for example though. Let's fix the issue to avoid port addressing issues later on. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reviewed-by: Andy Shevchenko Signed-off-by: Tony Lindgren --- drivers/tty/serial/8250/8250_core.c | 2 ++ drivers/tty/serial/serial_base_bus.c | 2 +- include/linux/serial_core.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -497,6 +497,7 @@ static struct uart_8250_port *serial8250_setup_port(int index) up = &serial8250_ports[index]; up->port.line = index; + up->port.port_id = index; serial8250_init_port(up); if (!base_ops) @@ -1040,6 +1041,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up) uart_remove_one_port(&serial8250_reg, &uart->port); uart->port.ctrl_id = up->port.ctrl_id; + uart->port.port_id = up->port.port_id; uart->port.iobase = up->port.iobase; uart->port.membase = up->port.membase; uart->port.irq = up->port.irq; diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -136,7 +136,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, err = serial_base_device_init(port, &port_dev->dev, &ctrl_dev->dev, &serial_port_type, serial_base_port_release, - port->line); + port->port_id); if (err) goto err_put_device; diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -460,6 +460,7 @@ struct uart_port { int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *iso7816); unsigned int ctrl_id; /* optional serial core controller id */ + unsigned int port_id; /* optional serial core port id */ unsigned int irq; /* irq number */ unsigned long irqflags; /* irq flags */ unsigned int uartclk; /* base uart clock */ From patchwork Tue Jul 25 05:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 125332 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2255954vqg; Mon, 24 Jul 2023 22:49:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlGgO7RCOrxecceOSlaGkWXaImSlTFbPAG71TQ1ryRttEL/inshYW7hkb9iO250+HB/P5559 X-Received: by 2002:a17:906:3292:b0:994:4e9c:30c6 with SMTP id 18-20020a170906329200b009944e9c30c6mr10064905ejw.57.1690264139900; Mon, 24 Jul 2023 22:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690264139; cv=none; d=google.com; s=arc-20160816; b=OJBdJ3Kd85Iz7lmsfEJRNq9X7hBxDaiRFy5T1/L6+nzYQkFASmZP6f+XbVyX8lTn/f /5SpR+aJYHluiuqAW0Irn0kQuyTiBRCcvwb/x2zPh9+k6s8/nUJw3h/a3xodYX3g0MjX 9zPonsxbzyGzyVcgeinSKmcHaYdsmH4iwlF4qPZ1CTGjCzOeO1ABmFRv73M87CkPRJiZ Z+KjoEn1BoSWDghXR49hCcvnfxSXbjSppw+PdHltfgfTtey9MH88eSfg1hGDLP4otpQM pDShxDpp+j5KCZjSPBmyecV1HEXxYE1I/W+b+p51imNay00lc/vPVBCmVWFna5Bdh/hq iUyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=SianzBZBNbsMFjX+N/mx0RXemP7xXLz1cxvt9Byz+iU=; fh=wxWR7S7XHVlqVIuoke4G1/IBIqVMAhyap/qryV8BrCQ=; b=Ss6zlMHBEhpXZoSD5al8Ip8NNDD+WGcFtooxnzh04M3fjG7w97HjsnJD8QkRB6DXBo 9lzqCq/Wa94JjF0U0HYTXLsjKXt97Wbf/6LdSnD8nwrXKzSIMROfrU5xJLfyf3Zm5UWY JLSz3syjg4cxjXlghuJT7am9R2ZbT3otLM+EvzEFUVS/pw6MAZoqcBzvmykXaValIYEP F9qHVjADVSD/QuXxi+z4IkapyDpsibgzFHSvfGfK/Udd1Bu02HrbHYdaTOY+BXmk4ZtD P4R4h368SISQdj4Njlsr+BephHeJzzP87XXfdUsPOXLYBAm0BuLvrA8CdneDQdF7/6p6 LCTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s25-20020a170906061900b00991c8af7ba5si7833123ejb.473.2023.07.24.22.48.35; Mon, 24 Jul 2023 22:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231575AbjGYFnV (ORCPT + 99 others); Tue, 25 Jul 2023 01:43:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231670AbjGYFmx (ORCPT ); Tue, 25 Jul 2023 01:42:53 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8DF301FC1; Mon, 24 Jul 2023 22:42:45 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 841038176; Tue, 25 Jul 2023 05:42:42 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v5 3/3] serial: core: Fix serial core controller port name to show controller id Date: Tue, 25 Jul 2023 08:42:12 +0300 Message-ID: <20230725054216.45696-4-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725054216.45696-1-tony@atomide.com> References: <20230725054216.45696-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772370411042258798 X-GMAIL-MSGID: 1772370411042258798 We are missing the serial core controller id for the serial core port name. Let's fix the issue for sane sysfs output, and to avoid issues addressing serial ports later on. And as we're now showing the controller id, the "ctrl" and "port" prefix for the DEVNAME become useless, we can just drop them. Let's standardize on DEVNAME:0 for controller name, where 0 is the controller id. And DEVNAME:0.0 for port name, where 0.0 are the controller id and port id. This makes the sysfs output nicer, on qemu for example: $ ls /sys/bus/serial-base/devices 00:04:0 serial8250:0 serial8250:0.2 00:04:0.0 serial8250:0.1 serial8250:0.3 Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Tony Lindgren Acked-by: Andy Shevchenko --- Andy, I kept your Reviewed-by although I updated the device naming and description, does the patch still look OK to you? --- drivers/tty/serial/serial_base_bus.c | 32 +++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -19,6 +19,14 @@ static bool serial_base_initialized; +static const struct device_type serial_ctrl_type = { + .name = "ctrl", +}; + +static const struct device_type serial_port_type = { + .name = "port", +}; + static int serial_base_match(struct device *dev, struct device_driver *drv) { int len = strlen(drv->name); @@ -48,7 +56,8 @@ static int serial_base_device_init(struct uart_port *port, struct device *parent_dev, const struct device_type *type, void (*release)(struct device *dev), - int id) + unsigned int ctrl_id, + unsigned int port_id) { device_initialize(dev); dev->type = type; @@ -61,13 +70,16 @@ static int serial_base_device_init(struct uart_port *port, return -EPROBE_DEFER; } - return dev_set_name(dev, "%s.%s.%d", type->name, dev_name(port->dev), id); + if (type == &serial_ctrl_type) + return dev_set_name(dev, "%s:%d", dev_name(port->dev), ctrl_id); + + if (type == &serial_port_type) + return dev_set_name(dev, "%s:%d.%d", dev_name(port->dev), + ctrl_id, port_id); + + return -EINVAL; } -static const struct device_type serial_ctrl_type = { - .name = "ctrl", -}; - static void serial_base_ctrl_release(struct device *dev) { struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev); @@ -96,7 +108,7 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, err = serial_base_device_init(port, &ctrl_dev->dev, parent, &serial_ctrl_type, serial_base_ctrl_release, - port->ctrl_id); + port->ctrl_id, 0); if (err) goto err_put_device; @@ -112,10 +124,6 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, return ERR_PTR(err); } -static const struct device_type serial_port_type = { - .name = "port", -}; - static void serial_base_port_release(struct device *dev) { struct serial_port_device *port_dev = to_serial_base_port_device(dev); @@ -136,7 +144,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, err = serial_base_device_init(port, &port_dev->dev, &ctrl_dev->dev, &serial_port_type, serial_base_port_release, - port->port_id); + port->ctrl_id, port->port_id); if (err) goto err_put_device;