From patchwork Sun Aug 6 06:20:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 131562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp786440vqr; Sat, 5 Aug 2023 23:24:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IED4GpTc7ZJRQVYmvP36JnC3fTEXkNgNbt8cN9ufjHT0uOJkJhet/QQfbPIBuUeTvvvE5jK X-Received: by 2002:a05:6402:104a:b0:522:b112:6254 with SMTP id e10-20020a056402104a00b00522b1126254mr4578602edu.4.1691303070602; Sat, 05 Aug 2023 23:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691303070; cv=none; d=google.com; s=arc-20160816; b=Hg8bAQrUA9I5MV1e5dzHp45pWl0oGbt8zbVJAdn+MnHPs+hvLGuryc6Y6sSEoAa39b 1izYVeF2vl/XUdzc3FrB/tGSbLb9TpypSSnJC7Ftow0kiobzDqtjU0vZY/aqfUOiUjBX PYW1PGHQwlWrwpVc5Za2qJ7UfWpQ5lKF1FAjjkFw3A/ue/hH4Ruetz9f4oY6W4EDaGvU G1yeVsF51J7JEH1hl8EpjHlZmbWI8Z0Fg680b5vwjVZglUTlk/7qne1htcLg8d7vs/Jh WDXfQOPpm/L/ic26vNtmTenEWU2UYPsH9p1DxhZZZgwPIJjnJHiTir7nrusjqzQiwcm4 K/4g== 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 :message-id:date:subject:cc:to:from; bh=u94z/KwztownUlkNEwaA6LJqkKu81gvscsuMNIW0e2w=; fh=9vvjMImc+CdpIXDXFkpgV6wGtjCqyXV1Lpr5uI9P1wc=; b=jvpq2DZLsISQB0yMYAmpjBS1pVcgGomGZQEi9H6FGG36olP/jMfz+gO3lpFVVAk/A6 udOHl+zU80Jp6q81XYbRcfqp54LFw2RC3VteacDizJw1I3Mso8qQjknaD9+VrZnWtbDn R87tZEPdtopB64E6d2NSdjxd2uJKwdt2SgARMmBI8HOGs2JKe3IZ1aVMb465T37gtdrB QsC4Mz0UuWSmMT6FcDQNqWomfxnkLaVoizj9qIC2j8VbeXFAISvPNZKjj18eVrUyoaHC dGPAB8kk17uW3pYdIJUAtf9k2JemxHwfvT/9vPUaWKNEbsnWrpV02NX7wBBCQSvbxw7P bP0A== 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 l14-20020aa7c30e000000b0052335100b2bsi560663edq.477.2023.08.05.23.24.04; Sat, 05 Aug 2023 23:24:30 -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 S229544AbjHFGVH (ORCPT + 99 others); Sun, 6 Aug 2023 02:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbjHFGVG (ORCPT ); Sun, 6 Aug 2023 02:21:06 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3028A1FCF; Sat, 5 Aug 2023 23:21:02 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 50ECA80A0; Sun, 6 Aug 2023 06:20:59 +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, Guenter Roeck Subject: [PATCH] serial: core: Revert port_id use Date: Sun, 6 Aug 2023 09:20:50 +0300 Message-ID: <20230806062052.47737-1-tony@atomide.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE 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: 1773459808544188304 X-GMAIL-MSGID: 1773459808544188304 Guenter reports boot issues with duplicate sysfs entries for multiport drivers. Let's go back to using port->line for now to fix the regression. With this change, the serial core port device names are not correct for the hardware specific 8250 single port drivers, but that's a cosmetic issue for now. Fixes: d962de6ae51f ("serial: core: Fix serial core port id to not use port->line") Reported-by: Guenter Roeck Signed-off-by: Tony Lindgren Tested-by: Guenter Roeck Tested-by: Guenter Roeck --- drivers/tty/serial/serial_base_bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ -151,7 +151,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->ctrl_id, port->port_id); + port->ctrl_id, port->line); if (err) goto err_put_device;