From patchwork Tue Sep 12 11:03:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 138146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp371893vqx; Tue, 12 Sep 2023 05:33:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGH16kMFAAGrUegZI00RayGBYlT0mwMKmvVoboDrdwDD7U6h2QvxAymG7jV33xQMYlDr5jU X-Received: by 2002:a17:90a:990a:b0:268:1b62:2f6c with SMTP id b10-20020a17090a990a00b002681b622f6cmr11595412pjp.2.1694521986726; Tue, 12 Sep 2023 05:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694521986; cv=none; d=google.com; s=arc-20160816; b=HmA0SvveSBYCtRIBe2DVACLTr6RxWX/zVu4UffYRTJPc3EiUdBhYIt3mmeXOFtmLsv 4N3/w5GlzltyINI1jQ3vBntTkP1E76iSgBYlkOoiCz9DQgqUu9dVllgWtRHQekSucri1 GB2OtTI80vcXV/HMLNJBus7BKBzJVkpWlgJ65xVGZzxD2qAUlo1QSeF8zh+q3/xibIv2 uRU5MK0EiFMv+guMaHaVnDwJqcZRrflrePGV7JlAEMTEWdbU+7tA66+SzeRmJ+8BgETC wTA8i+NPRFovDIzx7/7DMebxWW0a0SNUjdobDg+b9LHzYi4U9jbEuCMS2QeQMHWkZt31 jS+g== 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=ZsmWTIj+YpkVwpoqu9EiSWN4CRc9tEaN9ASH2sPsVvk=; fh=W1MwYucirABiDn2IBBfC2XauxZd5y0E72qME+lLcRs4=; b=PPeTghlquMEOpUdm52rm5nWxnGXVwNWXjTI9NrMlZvELvDA0iqfjzjgpBxLT955cHn Y4h3lWsPfCuXEy7gYrFgx7Hkt0m1TfDuqdwVxpYWcvpxI251hZSc4Gt+yRNTOT6hMe95 6wEq0TdvQwTRvuoo44F01BmfeD+pj7TjnG0530LifxhXYY6xtSqltZXdLkfH4X+vPxMk Hno8cP+I30fks2NAzQGtYjRhH3vd79zXgp4MSMR26kOLEMjnYiJttC3aFkIREEaNPhqv A2SbH4PUAcNdM4nb5+YZH10k2trIPdpIW2DhMjqQvZ/qIdm8WBgcniSy3OwZXrj9mo0j lEOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id l20-20020a17090aaa9400b0027198fe5672si7797353pjq.129.2023.09.12.05.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 05:33:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id C052F80AFE9A; Tue, 12 Sep 2023 04:05:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234282AbjILLFI (ORCPT + 37 others); Tue, 12 Sep 2023 07:05:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234555AbjILLEX (ORCPT ); Tue, 12 Sep 2023 07:04:23 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E190A9F; Tue, 12 Sep 2023 04:04:14 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 3BF168106; Tue, 12 Sep 2023 11:04:12 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , John Ogness Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v2 1/3] printk: Constify name for add_preferred_console() Date: Tue, 12 Sep 2023 14:03:43 +0300 Message-ID: <20230912110350.14482-2-tony@atomide.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230912110350.14482-1-tony@atomide.com> References: <20230912110350.14482-1-tony@atomide.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 12 Sep 2023 04:05:34 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776835087028484440 X-GMAIL-MSGID: 1776835087028484440 While adding a preferred console handling for serial_core for serial port hardware based device addressing, Jiri suggested we constify name for add_preferred_console(). The gets copied anyways. This allows serial core to add a preferred console using serial drv->dev_name without copying it. Note that constifying options causes changes all over the place because of struct console for match(). Cc: John Ogness Cc: Petr Mladek Cc: Sergey Senozhatsky Cc: Steven Rostedt Suggested-by: Jiri Slaby Signed-off-by: Tony Lindgren Reviewed-by: Petr Mladek --- include/linux/console.h | 2 +- kernel/printk/printk.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/console.h b/include/linux/console.h --- a/include/linux/console.h +++ b/include/linux/console.h @@ -337,7 +337,7 @@ enum con_flush_mode { CONSOLE_REPLAY_ALL, }; -extern int add_preferred_console(char *name, int idx, char *options); +extern int add_preferred_console(const char *name, int idx, char *options); extern void console_force_preferred_locked(struct console *con); extern void register_console(struct console *); extern int unregister_console(struct console *); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2400,7 +2400,7 @@ static void set_user_specified(struct console_cmdline *c, bool user_specified) console_set_on_cmdline = 1; } -static int __add_preferred_console(char *name, int idx, char *options, +static int __add_preferred_console(const char *name, int idx, char *options, char *brl_options, bool user_specified) { struct console_cmdline *c; @@ -2509,7 +2509,7 @@ __setup("console=", console_setup); * commonly to provide a default console (ie from PROM variables) when * the user has not supplied one. */ -int add_preferred_console(char *name, int idx, char *options) +int add_preferred_console(const char *name, int idx, char *options) { return __add_preferred_console(name, idx, options, NULL, false); }