Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752948Ab1EABic (ORCPT ); Sat, 30 Apr 2011 21:38:32 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:52916 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755339Ab1EABhZ (ORCPT ); Sat, 30 Apr 2011 21:37:25 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=TaKLr3zZihBBzGXxsJaePHd86bL6EtVNGx5M9f+uLiiOPrszF8i/84JY2NgNcGe8Xo 0wW50/oVSDJgt7wiRCl1qfsl3egrFIeHjKB3hWcglXbcHgeNRpDKDgrPWtt5VVXMLTCD jyw/epuGseUCjXxD5SeKPwBhFMar9l7zSaXPo= From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: Lucian Adrian Grijincu Subject: [PATCH 18/69] sysctl: remove .child from dev/scsi Date: Sun, 1 May 2011 03:35:48 +0200 Message-Id: <1304213799-10257-19-git-send-email-lucian.grijincu@gmail.com> X-Mailer: git-send-email 1.7.5.134.g1c08b In-Reply-To: <1304213799-10257-1-git-send-email-lucian.grijincu@gmail.com> References: <1304213799-10257-1-git-send-email-lucian.grijincu@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1673 Lines: 62 Signed-off-by: Lucian Adrian Grijincu --- drivers/scsi/scsi_sysctl.c | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c index 2b6b93f..a28707f 100644 --- a/drivers/scsi/scsi_sysctl.c +++ b/drivers/scsi/scsi_sysctl.c @@ -13,25 +13,19 @@ static ctl_table scsi_table[] = { - { .procname = "logging_level", - .data = &scsi_logging_level, - .maxlen = sizeof(scsi_logging_level), - .mode = 0644, - .proc_handler = proc_dointvec }, + { + .procname = "logging_level", + .data = &scsi_logging_level, + .maxlen = sizeof(scsi_logging_level), + .mode = 0644, + .proc_handler = proc_dointvec, + }, { } }; -static ctl_table scsi_dir_table[] = { - { .procname = "scsi", - .mode = 0555, - .child = scsi_table }, - { } -}; - -static ctl_table scsi_root_table[] = { - { .procname = "dev", - .mode = 0555, - .child = scsi_dir_table }, +static const __initdata struct ctl_path scsi_path[] = { + { .procname = "dev" }, + { .procname = "scsi" }, { } }; @@ -39,7 +33,7 @@ static struct ctl_table_header *scsi_table_header; int __init scsi_init_sysctl(void) { - scsi_table_header = register_sysctl_table(scsi_root_table); + scsi_table_header = register_sysctl_paths(scsi_path, scsi_table); if (!scsi_table_header) return -ENOMEM; return 0; -- 1.7.5.134.g1c08b -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/