From patchwork Fri Jul 21 07:21:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 123630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp37560vqg; Fri, 21 Jul 2023 00:51:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlHo/+CCMvLGvyJrgAf8JY/0Snw4hE+0ahE9lKQ19pheUrpOXNqZ7G8sdlrAPxWGS3gDyYGp X-Received: by 2002:a81:5c89:0:b0:579:f30f:8cdc with SMTP id q131-20020a815c89000000b00579f30f8cdcmr1449561ywb.15.1689925872964; Fri, 21 Jul 2023 00:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689925872; cv=none; d=google.com; s=arc-20160816; b=1Ek6IQztclEzSmHEfpq3kIvOE8EBsCK3/5KkmaqfhmUCLEfgethch72Flds3e1E0qc 80DS80dMAFsaUQIqwaDBfP0hGk5yeHb+ViQqUuONmGLU5etiRXD0Q/rckZ1kZ169tiUe KQXlNkVHZi1rOzPyXe01ZYJWNTUXnLwCSu0pVFrfwrDcDi60ElRl+/6TzdxEy9Rp5w2n svoE1zRnbHkUcAQVwzvxIncLXupoqrOkTAPTBkm8eu5/f+c++OAeI24uwV6ZWGXGSqFM trbFoCGqMdEAQTNPP98mUxpRJHfzVwJCZgsQxCFDkJYMnkRUgfYsUH2KvGt3E79zFQGC ifEA== 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=dJVxQOdrvO7cbea4hc+vrBFGY1P6QkJfrEqbvy2Szs4=; fh=FA6ePB5qaQomILOxean7/aeC0yiLQTvA2tKVpPqChRo=; b=etPuq0RAb97Pp6GwYSIHNQ6N6BFVfaIf7xrYfoqsKJ5UPk2L0CZMzVf16g/q3NotTx +qVlqFW9GNwElfi7JjDiq0aLWdo/BEJYfn1oNy6wpApOm/Z6+xKBnHKJQpp0QDETMKLn 6AL2lO9XpwxIIRsVhCHBV326T4LV8Gs2V5dvKBFZ9n7Wkygjggf73oSQQ86rQ28IOC8k RG4n1kzlxKJTgeF/gyn4LpAKzVzSyDDFWsHvl5NRioxK6g19SPomqI6PAe5QsDuB9VnV YcEZS4ceMRPdLojGbwWS0cT2/E0PkxkWFmbY4yNUOlitpPJJELpOp0m9544t5Se1Vegw mzGA== 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 b3-20020a17090a9bc300b002639c4f81d5si5245536pjw.147.2023.07.21.00.51.00; Fri, 21 Jul 2023 00:51:12 -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 S230128AbjGUHWX (ORCPT + 99 others); Fri, 21 Jul 2023 03:22:23 -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 S230122AbjGUHWQ (ORCPT ); Fri, 21 Jul 2023 03:22:16 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2067730DB; Fri, 21 Jul 2023 00:22:10 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 082ED807E; Fri, 21 Jul 2023 07:22:07 +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, linux-omap@vger.kernel.org Subject: [PATCH v3 1/3] serial: core: Controller id cannot be negative Date: Fri, 21 Jul 2023 10:21:40 +0300 Message-ID: <20230721072147.59121-2-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721072147.59121-1-tony@atomide.com> References: <20230721072147.59121-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: 1772015712233759652 X-GMAIL-MSGID: 1772015712233759652 The controller id cannot be negative. Let's fix the ctrl_id in preparation for adding port port_id to fix the device name. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-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 Fri Jul 21 07:21:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 123643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp39928vqg; Fri, 21 Jul 2023 00:58:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlFdg6Z+blChIK5uA+JrpG56d1euQydWz07ewwT6Lw4cTbJgCslGgblr58JyR/hNKaKMn+Wq X-Received: by 2002:a17:906:2208:b0:998:de72:4c89 with SMTP id s8-20020a170906220800b00998de724c89mr1172103ejs.50.1689926280468; Fri, 21 Jul 2023 00:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689926280; cv=none; d=google.com; s=arc-20160816; b=rHgfHKVzq5l3DJlQ+4VB06655bKJHcQjYFFRfvOMl+k2vXoanBfrrBe0sPi/JV9j2P zjLmWxb+8bkNiHSJ3M7OmhgfKJ2+McVfKoKcgZ9lGgqYxqMIG+Q9Yq1+FuJy48gZGoSu ZJBih91oFT1OnFTMhP5yyYkCNG+ZK9nGkFYrVVDuirEIUfcAQiDmr1jYA1z07pIWJZG0 9F+vMPlRJwz2CscwQKA3RGXPB+WwB4JUkpbZ6Hc7pt5WflWWCySQqHUjSYOm0gOc8pCf czaTawHhxxWObXiDDxElRKnebMuhcdCEdtmlkJDr/cFAEAmAeF+VLty2ohMADC8KbwRR IJ7Q== 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=hMBdZ2x06ff5cNWhIvW5d7okSD4QNjoqzFoC7cOYL1s=; fh=FA6ePB5qaQomILOxean7/aeC0yiLQTvA2tKVpPqChRo=; b=z8aREDduDbVTwvu+HGr1ofqIVSf0OoqkkFfBJ3RjTDeNYie3MlWPtaQHLUhE16w6jh CyPGAZteM4io66Hx5ujXn56UNvXkQQtEeIW/byk8IVoWhrUh0mTP+UZiE/TueKMMjMSW x5Vx3so9bTN7RsrqjAPpCECt0fARs5VVVAHJasymCcS0OGTSaSvWJyoQbR/szbkEO9Hb gZjZJPtKulBz689n9fZ1MZ0SA1iopOe7D/lEATAWVx6FOcyavzliRGBPHkRNMlw62Abf 6BHSSSrH6vGCqHTPDlXa+0heB2DqJFEE/ts/M6jmqRM/BQg0ZBb7fqv16HO/EzeqmYri JQSQ== 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 y22-20020a17090614d600b00989027eb30bsi1925565ejc.610.2023.07.21.00.57.35; Fri, 21 Jul 2023 00:58:00 -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 S230228AbjGUHWi (ORCPT + 99 others); Fri, 21 Jul 2023 03:22:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjGUHW0 (ORCPT ); Fri, 21 Jul 2023 03:22:26 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A1E742D6D; Fri, 21 Jul 2023 00:22:18 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 0CCBA813C; Fri, 21 Jul 2023 07:22:15 +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, linux-omap@vger.kernel.org Subject: [PATCH v3 2/3] serial: core: Fix serial core port id to not use port->line Date: Fri, 21 Jul 2023 10:21:41 +0300 Message-ID: <20230721072147.59121-3-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721072147.59121-1-tony@atomide.com> References: <20230721072147.59121-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: 1772016139564635340 X-GMAIL-MSGID: 1772016139564635340 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") 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 Fri Jul 21 07:21:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 123628 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp37415vqg; Fri, 21 Jul 2023 00:50:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlEO5VRNUHKYVF++2y2dOs0V2k2CiVmBwjnBn3mAe3bDKQ4LEWC3otnhdqbSKRJ3cs6+EHFO X-Received: by 2002:a0d:e7c6:0:b0:577:1560:9e17 with SMTP id q189-20020a0de7c6000000b0057715609e17mr1148473ywe.35.1689925848402; Fri, 21 Jul 2023 00:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689925848; cv=none; d=google.com; s=arc-20160816; b=pRC6PJF654BKHADqusWcaEO9VesknLkDNe3IFfLzm3z4Di9WNCLErpIgy8E4LXYd30 Of8PKoHXw076sl1j+gHi6M5K6qVcnvV3hAsaY1jvQ68CN+Ff8bZYCQveHYyeh2YgQkGK iz7jGVr5KNAARGuPGkY/StsRbwQy0KMrb0iP8LCzbSzMYLHi9CjTu9J76YLDS1dXuJeV S1bWW0Csfa/fF+l78f0brx9y6hQZqId+uqdFdl9jAayCnc96k82/h1FwxLBiHqCNbDIF yP48LnL2nsDbyx/03bMCzSl2AjEMmmIR7LVmeSbCBGPai//PbO8RsYY1bftH7VpAcAeo y+BA== 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=y0JHQjF8gsieRa+s2IUsb/mexsoF2As7y75NOkiIvJA=; fh=FA6ePB5qaQomILOxean7/aeC0yiLQTvA2tKVpPqChRo=; b=BwbrOc4baQXkBecCS0FJzshYMVtyvvyUDIpe4QdBmP6rYBDvJUeIMNVNwsH5klrmH5 QXUMlz14MstGpyetOjit9NGrJPWSFAl2U+c/BulkNZA6i7p822JusyFOSN9MsHvwPBYQ XUyafC3xtEz53Rno0Wqyqe95iQA0feW0I3WbU6ESCvd9POUpeXBNEvMb4JAW0tSWGGHm n4n/l7FklDCCiI/iiI/CGjMXw2nwRCXmsDjFqldwYO0HXiIwlHsACtLhC11Ct+9ADR/f 1JI8qEoJklSDUsh55M0kOLT+x58s9MB3R5BGcDpB2KeNqGdfu2kEzoZfQGbhoRhZXh+/ 6QJA== 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 ei35-20020a056a0080e300b0067e5edde6eesi2367065pfb.302.2023.07.21.00.50.35; Fri, 21 Jul 2023 00:50:48 -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 S230290AbjGUHWq (ORCPT + 99 others); Fri, 21 Jul 2023 03:22:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230208AbjGUHWd (ORCPT ); Fri, 21 Jul 2023 03:22:33 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6B3E730D2; Fri, 21 Jul 2023 00:22:25 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id E612D807E; Fri, 21 Jul 2023 07:22:22 +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, linux-omap@vger.kernel.org Subject: [PATCH v3 3/3] serial: core: Fix serial core controller port name to show controller id Date: Fri, 21 Jul 2023 10:21:42 +0300 Message-ID: <20230721072147.59121-4-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721072147.59121-1-tony@atomide.com> References: <20230721072147.59121-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,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: 1772015686107349808 X-GMAIL-MSGID: 1772015686107349808 We are missing the serial core controller id for the serial core port name. Let's fix the issue for sane /sys/bus/serial-core/devices, and to avoid issues addressing serial ports later on. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Signed-off-by: Tony Lindgren --- drivers/tty/serial/serial_base_bus.c | 33 ++++++++++++++++++---------- 1 file changed, 21 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,17 @@ 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.%s.%d", type->name, + dev_name(port->dev), ctrl_id); + else if (type == &serial_port_type) + return dev_set_name(dev, "%s.%s.%d.%d", type->name, + dev_name(port->dev), ctrl_id, + port_id); + else + 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 +109,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 +125,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 +145,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;