From patchwork Sun Dec 9 16:27:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 10720135 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08AEF91E for ; Sun, 9 Dec 2018 16:28:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAD162A349 for ; Sun, 9 Dec 2018 16:28:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA4DA2A34C; Sun, 9 Dec 2018 16:28:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 37E992A349 for ; Sun, 9 Dec 2018 16:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=RRCuHK+6hTZs4XsRUQ3+FSRkE85THKZzivDQGZZAUn0=; b=suK UhJkJA0KnjqC4BoHKSA7+7thTRMGjQlWwsZHlaEJuxQVaQS633FUn2QdkD5reyfimdVknrg1UgZAF idOWFBS2MvfmXIPYZtctYah0TE9lpTWxH1GFpf2IXxGok9D6Ccuu68ynA0Lv5xth0yUM7O/9qP3pd ayh02X49QwyFy2wSLHJACZf8bgLvLPO+TF4S4/WEpTyrICU7kuhCUdtCXgXD8YFqMLxgiJ7PxS/GN Z3FzIkujF5xHz+PAbpJlxuWl4yIlio7wDhW8wbw5zaB6xkKa+L5NOVRJ3w2V8v+v/54ocuQ8wMs0Y wxLZMqQlEWiHY3SZ+mHemQriNCozGTg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW1w2-0003ud-5i; Sun, 09 Dec 2018 16:28:02 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW1vy-0003tA-IE; Sun, 09 Dec 2018 16:28:00 +0000 Received: by mail-pg1-x543.google.com with SMTP id 17so3844852pgg.1; Sun, 09 Dec 2018 08:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wANQ268hlc/LiTGW5pnZDhus9Y8mQ1vFLq6oOONiVlg=; b=hBVNHmvAPvgXT8GM5E7AHXlToCsS/80RXmVg8A881HAJ6cJOrw+mwRkZeA66ypTEK4 aPb/Q1qwfv56zjEHsEkl+PjJZX+Oi4k12smR3xJEhKSJ2ZdvQ1tr9p3WWWLYI3UsbWRa nInutOIM2/FA+kNb9Jj2wSuW7LVee1mLzKIqbuyDrd9KMtkn6lAMv3yz7kzeQ44KdRCk YV36w4VpbzbyS9XtA+0uOmWXuqOwd2mZQ09dRQAz6ylJcswRCtJ2CFT0xLjjbpgDDSVs cZXP9BJP6+pJa8Lhk2CgOFemPtdWS0JY4gTEiW0XkKahGTcYMz5+WxmAyPBbkAgK2W7B vmpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=wANQ268hlc/LiTGW5pnZDhus9Y8mQ1vFLq6oOONiVlg=; b=d4wTG/FTKH2gvfiNVWELTmmNP1U3OYP7yYVD+1aCs5im4DC2lvr/j6hUwshMAj0NF8 lJOSA/GaSACl9UgVvfNfNip7p2Er59xErmfsGMto/JnNQNYYI/GLmSVSHJT6hbFNqoqH vkNeJJmai4uYPSmjuWpiE5cM27pXBlgwcBrPZFQECo4PSAnHUn5brbi8bBcWKeBmhkEd 0/S4dpk96S3eRe68FRVLlPX41qLJxfmwJOxxfz7gS+PgvG7Jmmge4eCJziX4OGvGc80n DXhXWYN7QZxWh4ehMeZMZ7T1AZgxpWJYsEQONj0S/SLHaRZjByfL780gg8veHHDoyUBg JGEQ== X-Gm-Message-State: AA+aEWZOWH6QyYwlrv91zKCUurHz62wp4lXkBw5a+oKN0ACIY28oq1L4 w0YBRUtMXIk4coUHW4T8zJ8= X-Google-Smtp-Source: AFSGD/V/20qAjVRGEW2fVRo/BKucPqIAGQwX9SmiXnQl83F27T10lrBPUvqtNFytt0a/8m5WYcHRhQ== X-Received: by 2002:a63:62c3:: with SMTP id w186mr8175411pgb.345.1544372866624; Sun, 09 Dec 2018 08:27:46 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id s2sm15726358pfa.167.2018.12.09.08.27.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Dec 2018 08:27:45 -0800 (PST) From: Yangtao Li To: gregkh@linuxfoundation.org, pure.logic@nexus-software.ie, johan@kernel.org, elder@kernel.org, david.kershner@unisys.com, eric@anholt.net, stefan.wahren@i2se.com, viro@zeniv.linux.org.uk, kernelpatch@126.com, natechancellor@gmail.com, keescook@chromium.org, colin.king@canonical.com Subject: [PATCH] staging: convert to DEFINE_SHOW_ATTRIBUTE Date: Sun, 9 Dec 2018 11:27:42 -0500 Message-Id: <20181209162742.19767-1-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181209_082758_659504_623D8D51 X-CRM114-Status: GOOD ( 11.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, Yangtao Li , sparmaintainer@unisys.com, linux-kernel@vger.kernel.org, greybus-dev@lists.linaro.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code. Signed-off-by: Yangtao Li --- drivers/staging/fwserial/fwserial.c | 32 +++---------------- drivers/staging/greybus/loopback.c | 16 ++-------- drivers/staging/rtlwifi/debug.c | 23 ++++--------- .../staging/unisys/visorhba/visorhba_main.c | 14 +------- .../interface/vchiq_arm/vchiq_debugfs.c | 14 +------- 5 files changed, 14 insertions(+), 85 deletions(-) diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c index 173f451b86b7..3e416f5bbcba 100644 --- a/drivers/staging/fwserial/fwserial.c +++ b/drivers/staging/fwserial/fwserial.c @@ -1458,7 +1458,7 @@ static int fwtty_proc_show(struct seq_file *m, void *v) return 0; } -static int fwtty_debugfs_stats_show(struct seq_file *m, void *v) +static int fwtty_stats_show(struct seq_file *m, void *v) { struct fw_serial *serial = m->private; struct fwtty_port *port; @@ -1476,8 +1476,9 @@ static int fwtty_debugfs_stats_show(struct seq_file *m, void *v) } return 0; } +DEFINE_SHOW_ATTRIBUTE(fwtty_stats); -static int fwtty_debugfs_peers_show(struct seq_file *m, void *v) +static int fwtty_peers_show(struct seq_file *m, void *v) { struct fw_serial *serial = m->private; struct fwtty_peer *peer; @@ -1491,32 +1492,7 @@ static int fwtty_debugfs_peers_show(struct seq_file *m, void *v) rcu_read_unlock(); return 0; } - -static int fwtty_stats_open(struct inode *inode, struct file *fp) -{ - return single_open(fp, fwtty_debugfs_stats_show, inode->i_private); -} - -static int fwtty_peers_open(struct inode *inode, struct file *fp) -{ - return single_open(fp, fwtty_debugfs_peers_show, inode->i_private); -} - -static const struct file_operations fwtty_stats_fops = { - .owner = THIS_MODULE, - .open = fwtty_stats_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; - -static const struct file_operations fwtty_peers_fops = { - .owner = THIS_MODULE, - .open = fwtty_peers_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(fwtty_peers); static const struct tty_port_operations fwtty_port_ops = { .dtr_rts = fwtty_port_dtr_rts, diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 7080294f705c..33cda7527714 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -973,19 +973,7 @@ static int gb_loopback_dbgfs_latency_show(struct seq_file *s, void *unused) return gb_loopback_dbgfs_latency_show_common(s, &gb->kfifo_lat, &gb->mutex); } - -static int gb_loopback_latency_open(struct inode *inode, struct file *file) -{ - return single_open(file, gb_loopback_dbgfs_latency_show, - inode->i_private); -} - -static const struct file_operations gb_loopback_debugfs_latency_ops = { - .open = gb_loopback_latency_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(gb_loopback_dbgfs_latency); static int gb_loopback_bus_id_compare(void *priv, struct list_head *lha, struct list_head *lhb) @@ -1076,7 +1064,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle, snprintf(name, sizeof(name), "raw_latency_%s", dev_name(&connection->bundle->dev)); gb->file = debugfs_create_file(name, S_IFREG | 0444, gb_dev.root, gb, - &gb_loopback_debugfs_latency_ops); + &gb_loopback_dbgfs_latency_fops); gb->id = ida_simple_get(&loopback_ida, 0, 0, GFP_KERNEL); if (gb->id < 0) { diff --git a/drivers/staging/rtlwifi/debug.c b/drivers/staging/rtlwifi/debug.c index 8999feda29b4..543889923864 100644 --- a/drivers/staging/rtlwifi/debug.c +++ b/drivers/staging/rtlwifi/debug.c @@ -79,24 +79,13 @@ struct rtl_debugfs_priv { static struct dentry *debugfs_topdir; -static int rtl_debug_get_common(struct seq_file *m, void *v) +static int common_show(struct seq_file *m, void *v) { struct rtl_debugfs_priv *debugfs_priv = m->private; return debugfs_priv->cb_read(m, v); } - -static int dl_debug_open_common(struct inode *inode, struct file *file) -{ - return single_open(file, rtl_debug_get_common, inode->i_private); -} - -static const struct file_operations file_ops_common = { - .open = dl_debug_open_common, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(common); static int rtl_debug_get_mac_page(struct seq_file *m, void *v) { @@ -439,7 +428,7 @@ static ssize_t rtl_debugfs_common_write(struct file *filp, return debugfs_priv->cb_write(filp, buffer, count, loff); } -static const struct file_operations file_ops_common_write = { +static const struct file_operations common_write_fops = { .owner = THIS_MODULE, .write = rtl_debugfs_common_write, .open = simple_open, @@ -488,7 +477,7 @@ static int rtl_debugfs_open_rw(struct inode *inode, struct file *filp) int ret = 0; if (filp->f_mode & FMODE_READ) - ret = single_open(filp, rtl_debug_get_common, inode->i_private); + ret = single_open(filp, common_show, inode->i_private); else filp->private_data = inode->i_private; @@ -509,7 +498,7 @@ static struct rtl_debugfs_priv rtl_debug_priv_phydm_cmd = { .cb_data = 0, }; -static const struct file_operations file_ops_common_rw = { +static const struct file_operations common_rw_fops = { .owner = THIS_MODULE, .open = rtl_debugfs_open_rw, .release = rtl_debugfs_close_rw, @@ -523,7 +512,7 @@ static const struct file_operations file_ops_common_rw = { rtl_debug_priv_ ##name.rtlpriv = rtlpriv; \ debugfs_create_file(#name, mode, parent, \ &rtl_debug_priv_ ##name, \ - &file_ops_ ##fopname); \ + &fopname ##fops); \ } while (0) #define RTL_DEBUGFS_ADD(name) \ diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 4fc521c51c0e..d0fed63c13a2 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -681,19 +681,7 @@ static int info_debugfs_show(struct seq_file *seq, void *v) return 0; } - -static int info_debugfs_open(struct inode *inode, struct file *file) -{ - return single_open(file, info_debugfs_show, inode->i_private); -} - -static const struct file_operations info_debugfs_fops = { - .owner = THIS_MODULE, - .open = info_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(info_debugfs); /* * complete_taskmgmt_command - Complete task management diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c index 6a9e71a61142..46ba21967820 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c @@ -153,19 +153,7 @@ static int debugfs_usecount_show(struct seq_file *f, void *offset) return 0; } - -static int debugfs_usecount_open(struct inode *inode, struct file *file) -{ - return single_open(file, debugfs_usecount_show, inode->i_private); -} - -static const struct file_operations debugfs_usecount_fops = { - .owner = THIS_MODULE, - .open = debugfs_usecount_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(debugfs_usecount); static int debugfs_trace_show(struct seq_file *f, void *offset) {