From patchwork Fri Mar 10 23:35:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 67875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp41910wrd; Fri, 10 Mar 2023 16:19:42 -0800 (PST) X-Google-Smtp-Source: AK7set/aUPHS4L2w3u7N7Vl7gnGhfSxmGokWfH+HQZ4UcsbmLAx0HNAZFCGl9OvYtVIBPzeHCaeY X-Received: by 2002:a17:902:8643:b0:19c:f80c:df90 with SMTP id y3-20020a170902864300b0019cf80cdf90mr25092815plt.45.1678493982134; Fri, 10 Mar 2023 16:19:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678493982; cv=none; d=google.com; s=arc-20160816; b=BJKQ3wAdk0uGFpgFh6+gjFI7gc8+7DJMInUPeQnwHrZ/hFKxSvaHLS5vuSkeQOwLKD Jw3JsU09UKzHyfvdQUnMwFJZjYM3CFnNzvwoOlCj4CuzZ8hbuIj8rUrOI8f4v4+M4cjH 3wnG/J68woemHsdR2VwiIbY+PXa7fv6/mosiubs+GN1iGAviYZjovQyklekrSUFsX+fz v2a03VJnQapVVedB9s15gnXpZOpJ59pgQCyOk10gvoZ17z3IGArABgpRKmt7EkmNsNdd 1A6WrUuOFWcybgBMaNLhE4CJuFTswjAdA4dY/XhXWXEqugpMGdS3yhG8SIs/ZGAiGSOZ O6YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=hPK/fuqWGb+L/yq0FoqZh+t2EUt8CyQKsPoCgU3n1N4=; b=OOPUZ8jR6zS5/vTNQkQgOKB2RMficQp8zJLFt+HhfD97DHpffFr6T/UdRZyhAlP5fY 8gRJ0+wenF2dbbWksIqfg0dKWO+ER6PclwAfqujVcH0j1mdnMZRpkAzxXsr+Vz5mz50c sTyBn/CxZE36kV/G84ZzSMFkIQNn7Ev0nZIFdM3QLLFl8PdvlMQKmEA2Jspj8lnuLlvv TpmqTOjbWHUpD1NHYGfAD01sIxWmm6ZC0foenO23XDfMApItNo+s7O1wE1ymTZ+e6vZX HhTDfj1sF1jrUSWfhD5sBtoVpW0RKc26Bt7hC6BWr0mHgsYVumbBvRq4an6ZYKHe+EPh ukBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=WyfomRn9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o8-20020a1709026b0800b0019e6a6aa79dsi1087663plk.212.2023.03.10.16.19.29; Fri, 10 Mar 2023 16:19:42 -0800 (PST) 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; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=WyfomRn9; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231479AbjCJXfj (ORCPT + 99 others); Fri, 10 Mar 2023 18:35:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230477AbjCJXfh (ORCPT ); Fri, 10 Mar 2023 18:35:37 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4104D13F685; Fri, 10 Mar 2023 15:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=hPK/fuqWGb+L/yq0FoqZh+t2EUt8CyQKsPoCgU3n1N4=; b=WyfomRn9EHkdBQ+D/rCj4zc+2d r1EkjoZHO3xPwW9cM6oVpfstEGHHLjaz7SIF2ztkAnQJE1Iz67ybBYXnt5DbPlwRcLyxjBM7CdK6Z 3G5wGOORt71OnSCkdt+LgvoPKi4hcWBiV0dRwd4UzJodzpMlrsIL0mxYojGnHLBp2MajyRA2MubuA hqPgTuwbAXnWNGtKuQFgphJrHQVW+KbudGfyvVmrwvtwbGPfT8+VXPevRh/qAW17qFfMUVWMWO53n UJuLTolXNEXGWjwbq+fBz6npkmEEP+5V+5VoYdJtYiote9/eo/NXh0Sx1pGmtx5XMhtw7EX4O7sUd zzMRjGsw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pamGh-00GfIo-DK; Fri, 10 Mar 2023 23:35:23 +0000 From: Luis Chamberlain To: linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Cc: ebiederm@xmission.com, keescook@chromium.org, yzaikin@google.com, j.granados@samsung.com, patches@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH] arm: simplify two-level sysctl registration for ctl_isa_vars Date: Fri, 10 Mar 2023 15:35:21 -0800 Message-Id: <20230310233521.3971907-1-mcgrof@kernel.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Sender: Luis Chamberlain X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760028505677146417?= X-GMAIL-MSGID: =?utf-8?q?1760028505677146417?= There is no need to declare two tables to just create directories, this can be easily be done with a prefix path with register_sysctl(). Simplify this registration. Signed-off-by: Luis Chamberlain --- For more details see the new docs being updated [0]. [0] https://lore.kernel.org/all/20230310223947.3917711-1-mcgrof@kernel.org/T/#u arch/arm/kernel/isa.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c index d8a509c5d5bd..20218876bef2 100644 --- a/arch/arm/kernel/isa.c +++ b/arch/arm/kernel/isa.c @@ -40,27 +40,11 @@ static struct ctl_table ctl_isa_vars[4] = { static struct ctl_table_header *isa_sysctl_header; -static struct ctl_table ctl_isa[2] = { - { - .procname = "isa", - .mode = 0555, - .child = ctl_isa_vars, - }, {} -}; - -static struct ctl_table ctl_bus[2] = { - { - .procname = "bus", - .mode = 0555, - .child = ctl_isa, - }, {} -}; - void __init register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int portshift) { isa_membase = membase; isa_portbase = portbase; isa_portshift = portshift; - isa_sysctl_header = register_sysctl_table(ctl_bus); + isa_sysctl_header = register_sysctl("bus/isa", ctl_isa_vars); }