pinctrl: Change to use DEFINE_SHOW_ATTRIBUTE macro

Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c
index d3fe143..2c72293 100644 (file)
--- a/drivers/pinctrl/pinconf.c
+++ b/drivers/pinctrl/pinconf.c
@@ -366,29 +366,8 @@ static int pinconf_groups_show(struct seq_file *s, void *what)
        return 0;
 }
 
-static int pinconf_pins_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, pinconf_pins_show, inode->i_private);
-}
-
-static int pinconf_groups_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, pinconf_groups_show, inode->i_private);
-}
-
-static const struct file_operations pinconf_pins_ops = {
-       .open           = pinconf_pins_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-static const struct file_operations pinconf_groups_ops = {
-       .open           = pinconf_groups_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(pinconf_pins);
+DEFINE_SHOW_ATTRIBUTE(pinconf_groups);
 
 #define MAX_NAME_LEN 15
 
@@ -613,9 +592,9 @@ void pinconf_init_device_debugfs(struct dentry *devroot,
                         struct pinctrl_dev *pctldev)
 {
        debugfs_create_file("pinconf-pins", S_IFREG | S_IRUGO,
-                           devroot, pctldev, &pinconf_pins_ops);
+                           devroot, pctldev, &pinconf_pins_fops);
        debugfs_create_file("pinconf-groups", S_IFREG | S_IRUGO,
-                           devroot, pctldev, &pinconf_groups_ops);
+                           devroot, pctldev, &pinconf_groups_fops);
        debugfs_create_file("pinconf-config",  (S_IRUGO | S_IWUSR | S_IWGRP),
                            devroot, pctldev, &pinconf_dbg_pinconfig_fops);
 }

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 5780442..4d0cc18 100644 (file)
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -644,37 +644,16 @@ void pinmux_show_setting(struct seq_file *s,
                   setting->data.mux.func);
 }
 
-static int pinmux_functions_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, pinmux_functions_show, inode->i_private);
-}
-
-static int pinmux_pins_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, pinmux_pins_show, inode->i_private);
-}
-
-static const struct file_operations pinmux_functions_ops = {
-       .open           = pinmux_functions_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-static const struct file_operations pinmux_pins_ops = {
-       .open           = pinmux_pins_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(pinmux_functions);
+DEFINE_SHOW_ATTRIBUTE(pinmux_pins);
 
 void pinmux_init_device_debugfs(struct dentry *devroot,
                         struct pinctrl_dev *pctldev)
 {
        debugfs_create_file("pinmux-functions", S_IFREG | S_IRUGO,
-                           devroot, pctldev, &pinmux_functions_ops);
+                           devroot, pctldev, &pinmux_functions_fops);
        debugfs_create_file("pinmux-pins", S_IFREG | S_IRUGO,
-                           devroot, pctldev, &pinmux_pins_ops);
+                           devroot, pctldev, &pinmux_pins_fops);
 }
 
 #endif /* CONFIG_DEBUG_FS */