From patchwork Sun May 8 22:38:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucian Adrian Grijincu X-Patchwork-Id: 94699 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EB6E5B7041 for ; Mon, 9 May 2011 09:10:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756059Ab1EHWkk (ORCPT ); Sun, 8 May 2011 18:40:40 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:51704 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756011Ab1EHWkj (ORCPT ); Sun, 8 May 2011 18:40:39 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so5166752wwa.1 for ; Sun, 08 May 2011 15:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=iQ3WMgj8CsUl+nSwk1zhn8xLtVJtTtQ+1OTodkhS/wg=; b=oP0jipvYfP7WppoA6Stllpy25tn1s47Tr2lWpVDffQmhwZdVokg7g6VNl5yVhr7aOm ukWzOWx287usrWco0CpHf0XX5Pla49JvxEet45mXrP41KrQZGdlcY37mV3UIYQD1oTUn Sa2RjVvaigVGvXH6/yFb/4jXG7MrGkcHCS9E4= 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=JT5osxeWqhq75owWCg+A0oz7S3iWRdRDVNPnR7qUegXzjkyK4vllNiBa7xI5DpnMOb TtFrTy0DX0cBStScf4bhKy04bg9L0dBzHyCfTOgDrUYdTPzFqa5G3Jgd2688YW+2xRgg 9n8J8XcXCsoWc7JLCA0e2u670Cm5N9XFlI1VI= Received: by 10.227.182.2 with SMTP id ca2mr6474705wbb.89.1304894438502; Sun, 08 May 2011 15:40:38 -0700 (PDT) Received: from localhost.localdomain (aut75-5-82-239-182-128.fbx.proxad.net [82.239.182.128]) by mx.google.com with ESMTPS id ed10sm3390518wbb.66.2011.05.08.15.40.37 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 May 2011 15:40:37 -0700 (PDT) From: Lucian Adrian Grijincu To: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org, Lucian Adrian Grijincu Subject: [v2 009/115] sysctl: remove .child from dev/cdrom/ Date: Mon, 9 May 2011 00:38:21 +0200 Message-Id: <1304894407-32201-10-git-send-email-lucian.grijincu@gmail.com> X-Mailer: git-send-email 1.7.5.134.g1c08b In-Reply-To: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com> References: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Lucian Adrian Grijincu --- drivers/cdrom/cdrom.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 514dd8e..9560789 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -3654,26 +3654,12 @@ static ctl_table cdrom_table[] = { { } }; -static ctl_table cdrom_cdrom_table[] = { - { - .procname = "cdrom", - .maxlen = 0, - .mode = 0555, - .child = cdrom_table, - }, +static const struct ctl_path cdrom_root_path[] = { + { .procname = "dev" }, + { .procname = "cdrom" }, { } }; -/* Make sure that /proc/sys/dev is there */ -static ctl_table cdrom_root_table[] = { - { - .procname = "dev", - .maxlen = 0, - .mode = 0555, - .child = cdrom_cdrom_table, - }, - { } -}; static struct ctl_table_header *cdrom_sysctl_header; static void cdrom_sysctl_register(void) @@ -3683,7 +3669,7 @@ static void cdrom_sysctl_register(void) if (initialized == 1) return; - cdrom_sysctl_header = register_sysctl_table(cdrom_root_table); + cdrom_sysctl_header = register_sysctl_paths(cdrom_root_path, cdrom_table); /* set the defaults */ cdrom_sysctl_settings.autoclose = autoclose;