From patchwork Mon Apr 15 15:36:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 162198 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3069053jan; Mon, 15 Apr 2019 08:33:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5vMjOY6qQxqYZZaJwDdOLX10Q8k13uPuU6x+gon8DYEJ3KFCJJbK/m/TUMYUgsk/Cl20V X-Received: by 2002:a63:c145:: with SMTP id p5mr68562997pgi.339.1555342417820; Mon, 15 Apr 2019 08:33:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555342417; cv=none; d=google.com; s=arc-20160816; b=lhERRbqOfvNyTbSEv/2CQRL14bBAytSH0X6fsAhi6zKzsXIK+IY2/FZtytxQ2q2aq2 WeU40CX9ZPWjrkDDBQnOfMnjzV8CT6gCy+KG/QVEkJ0SXIVt8Ng+DJNQfXbq9U7sBzfV rn1L3o9GwN6dIYc/YujHeQIVsisnF+Cna2NT7SXDqEVrJzEy5J3yadBN90eydMLF1KRG ff19Ycsi2tTqZDqdi0ItXWbok0FVspsT0JJ7QLiO9lpV4ZCZQ7wuhlcyLGc3ymtxsjJP kjMN2UqakG6v/oJpHjoEKJW8TWFCOKoD7fgNkdL5j1DzQJJqIRjTwZK75C4+40/5jkFf 4mRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=naeODMw2JTB2zvbveGzI7NZUxJdvIvz0O8ekQwSm0jY=; b=vOiE1bIdzEjfYVQxnjJIJXT5wG5N/usXZ08XXkVX+eqFkBhTspDLyjPWoqFwfo6zVd b1qi2QfWMQFlGg3Y2x2DxfK4lGUOwZaaGbWVC6XC8MAoBQa+Z3pgejdciXepj6rxwGdA fi/Uqh6JKuv33Gj+PaNqQ6vxhnrGZrwuZ0l5L60A9siqbHrXGQoZf0v6qitRR9Jt417H WfcTRpFPOu/PUTARcyJ71DzdJTKGJlK22jzMS1XbENwBTBLTGheR7176IoA2FEX4fXmZ U6WqZEdkcCs3mBBTXFs9Ho7h8DU4xsyk0lnnfSmV3tvJdjoL3eAOPeuPndrmWqXZ45lK v10Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=DhIn4tW3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h65si48932564pfd.232.2019.04.15.08.33.37; Mon, 15 Apr 2019 08:33:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=DhIn4tW3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727794AbfDOPdf (ORCPT + 30 others); Mon, 15 Apr 2019 11:33:35 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:56044 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726147AbfDOPde (ORCPT ); Mon, 15 Apr 2019 11:33:34 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3FFXUVa094542; Mon, 15 Apr 2019 10:33:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1555342410; bh=naeODMw2JTB2zvbveGzI7NZUxJdvIvz0O8ekQwSm0jY=; h=From:To:Subject:Date:In-Reply-To:References; b=DhIn4tW3t84/PBawJYFsVdiHhhbOXQfWgeU54U7DarPjNfBBKKBNHWm3RmeONt0k6 kO7FyYm6t6xfpK47tzCw74CnQWASV+h7Y095axfkkzKb4qs8nfRr1WSbtFOVT4NZuO KpCev5vTA9jgs++NLuhMLXaXNkLMDJsa5yokvZlE= Received: from DFLE111.ent.ti.com (dfle111.ent.ti.com [10.64.6.32]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3FFXUpn017049 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 Apr 2019 10:33:30 -0500 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Mon, 15 Apr 2019 10:33:29 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Mon, 15 Apr 2019 10:33:29 -0500 Received: from uda0868495.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3FFXTjW041063; Mon, 15 Apr 2019 10:33:29 -0500 From: Murali Karicheri To: , , , Subject: [net-next PATCH v2 1/3] net: hsr: fix naming of file and functions Date: Mon, 15 Apr 2019 11:36:01 -0400 Message-ID: <20190415153603.23110-2-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190415153603.23110-1-m-karicheri2@ti.com> References: <20190415153603.23110-1-m-karicheri2@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix the file name and functions to match with existing implementation. Signed-off-by: Murali Karicheri --- net/hsr/Makefile | 2 +- net/hsr/{hsr_prp_debugfs.c => hsr_debugfs.c} | 34 ++++++++++---------- net/hsr/hsr_device.c | 4 +-- net/hsr/hsr_main.h | 8 ++--- 4 files changed, 24 insertions(+), 24 deletions(-) rename net/hsr/{hsr_prp_debugfs.c => hsr_debugfs.c} (74%) -- 2.17.0 diff --git a/net/hsr/Makefile b/net/hsr/Makefile index d74d89d013b0..e45757fc477f 100644 --- a/net/hsr/Makefile +++ b/net/hsr/Makefile @@ -6,4 +6,4 @@ obj-$(CONFIG_HSR) += hsr.o hsr-y := hsr_main.o hsr_framereg.o hsr_device.o \ hsr_netlink.o hsr_slave.o hsr_forward.o -hsr-$(CONFIG_DEBUG_FS) += hsr_prp_debugfs.o +hsr-$(CONFIG_DEBUG_FS) += hsr_debugfs.o diff --git a/net/hsr/hsr_prp_debugfs.c b/net/hsr/hsr_debugfs.c similarity index 74% rename from net/hsr/hsr_prp_debugfs.c rename to net/hsr/hsr_debugfs.c index b30e98734c61..b5a955013976 100644 --- a/net/hsr/hsr_prp_debugfs.c +++ b/net/hsr/hsr_debugfs.c @@ -1,5 +1,5 @@ /* - * hsr_prp_debugfs code + * hsr_debugfs code * Copyright (C) 2017 Texas Instruments Incorporated * * Author(s): @@ -26,9 +26,9 @@ static void print_mac_address(struct seq_file *sfp, unsigned char *mac) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } -/* hsr_prp_node_table_show - Formats and prints node_table entries */ +/* hsr_node_table_show - Formats and prints node_table entries */ static int -hsr_prp_node_table_show(struct seq_file *sfp, void *data) +hsr_node_table_show(struct seq_file *sfp, void *data) { struct hsr_priv *priv = (struct hsr_priv *)sfp->private; struct hsr_node *node; @@ -52,40 +52,40 @@ hsr_prp_node_table_show(struct seq_file *sfp, void *data) return 0; } -/* hsr_prp_node_table_open - Open the node_table file +/* hsr_node_table_open - Open the node_table file * * Description: * This routine opens a debugfs file node_table of specific hsr device */ static int -hsr_prp_node_table_open(struct inode *inode, struct file *filp) +hsr_node_table_open(struct inode *inode, struct file *filp) { - return single_open(filp, hsr_prp_node_table_show, inode->i_private); + return single_open(filp, hsr_node_table_show, inode->i_private); } -static const struct file_operations hsr_prp_fops = { +static const struct file_operations hsr_fops = { .owner = THIS_MODULE, - .open = hsr_prp_node_table_open, + .open = hsr_node_table_open, .read = seq_read, .llseek = seq_lseek, .release = single_release, }; -/* hsr_prp_debugfs_init - create hsr-prp node_table file for dumping +/* hsr_debugfs_init - create hsr node_table file for dumping * the node table * * Description: * When debugfs is configured this routine sets up the node_table file per - * hsr/prp device for dumping the node_table entries + * hsr device for dumping the node_table entries */ -int hsr_prp_debugfs_init(struct hsr_priv *priv) +int hsr_debugfs_init(struct hsr_priv *priv) { int rc = -1; struct dentry *de = NULL; de = debugfs_create_dir("hsr", NULL); if (!de) { - pr_err("Cannot create hsr-prp debugfs root\n"); + pr_err("Cannot create hsr debugfs root\n"); return rc; } @@ -93,9 +93,9 @@ int hsr_prp_debugfs_init(struct hsr_priv *priv) de = debugfs_create_file("node_table", S_IFREG | 0444, priv->node_tbl_root, priv, - &hsr_prp_fops); + &hsr_fops); if (!de) { - pr_err("Cannot create hsr-prp node_table directory\n"); + pr_err("Cannot create hsr node_table directory\n"); return rc; } priv->node_tbl_file = de; @@ -104,14 +104,14 @@ int hsr_prp_debugfs_init(struct hsr_priv *priv) return rc; } -/* hsr_prp_debugfs_term - Tear down debugfs intrastructure +/* hsr_debugfs_term - Tear down debugfs intrastructure * * Description: * When Debufs is configured this routine removes debugfs file system - * elements that are specific to hsr-prp + * elements that are specific to hsr */ void -hsr_prp_debugfs_term(struct hsr_priv *priv) +hsr_debugfs_term(struct hsr_priv *priv) { debugfs_remove(priv->node_tbl_file); priv->node_tbl_file = NULL; diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index b47a621e3f4e..58cf500ebf94 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -354,7 +354,7 @@ static void hsr_dev_destroy(struct net_device *hsr_dev) hsr = netdev_priv(hsr_dev); - hsr_prp_debugfs_term(hsr); + hsr_debugfs_term(hsr); rtnl_lock(); hsr_for_each_port(hsr, port) @@ -485,7 +485,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2], goto fail; mod_timer(&hsr->prune_timer, jiffies + msecs_to_jiffies(PRUNE_PERIOD)); - res = hsr_prp_debugfs_init(hsr); + res = hsr_debugfs_init(hsr); if (res) goto fail; diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h index 778213f07fe0..6cd4dff58727 100644 --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -184,15 +184,15 @@ static inline u16 hsr_get_skb_sequence_nr(struct sk_buff *skb) } #if IS_ENABLED(CONFIG_DEBUG_FS) -int hsr_prp_debugfs_init(struct hsr_priv *priv); -void hsr_prp_debugfs_term(struct hsr_priv *priv); +int hsr_debugfs_init(struct hsr_priv *priv); +void hsr_debugfs_term(struct hsr_priv *priv); #else -static inline int hsr_prp_debugfs_init(struct hsr_priv *priv) +static inline int hsr_debugfs_init(struct hsr_priv *priv) { return 0; } -static inline void hsr_prp_debugfs_term(struct hsr_priv *priv) +static inline void hsr_debugfs_term(struct hsr_priv *priv) {} #endif