mmc: convert to DEFINE_SHOW_ATTRIBUTE

Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index ef18daeaa4cc6f0a54f2814762fd7d615fcf4c9f..eabb1cab17656f2641a6936778a5ab540f493335 100644 (file)
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -3145,17 +3145,7 @@ static int mtf_testlist_show(struct seq_file *sf, void *data)
        return 0;
 }
 
-static int mtf_testlist_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, mtf_testlist_show, inode->i_private);
-}
-
-static const struct file_operations mmc_test_fops_testlist = {
-       .open           = mtf_testlist_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(mtf_testlist);
 
 static void mmc_test_free_dbgfs_file(struct mmc_card *card)
 {
@@ -3216,7 +3206,7 @@ static int mmc_test_register_dbgfs_file(struct mmc_card *card)
                goto err;
 
        ret = __mmc_test_register_dbgfs_file(card, "testlist", S_IRUGO,
-               &mmc_test_fops_testlist);
+               &mtf_testlist_fops);
        if (ret)
                goto err;
 

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index fbc56ee9968277634b7d8ede472070d89d486380..47189f9ed4e20bbb8d7b09a20f36c06c1a6ff14c 100644 (file)
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -446,18 +446,7 @@ static int atmci_req_show(struct seq_file *s, void *v)
        return 0;
 }
 
-static int atmci_req_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, atmci_req_show, inode->i_private);
-}
-
-static const struct file_operations atmci_req_fops = {
-       .owner          = THIS_MODULE,
-       .open           = atmci_req_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(atmci_req);
 
 static void atmci_show_status_reg(struct seq_file *s,
                const char *regname, u32 value)
@@ -583,18 +572,7 @@ static int atmci_regs_show(struct seq_file *s, void *v)
        return ret;
 }
 
-static int atmci_regs_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, atmci_regs_show, inode->i_private);
-}
-
-static const struct file_operations atmci_regs_fops = {
-       .owner          = THIS_MODULE,
-       .open           = atmci_regs_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(atmci_regs);
 
 static void atmci_init_debugfs(struct atmel_mci_slot *slot)
 {
@@ -608,13 +586,14 @@ static void atmci_init_debugfs(struct atmel_mci_slot *slot)
                return;
 
        node = debugfs_create_file("regs", S_IRUSR, root, host,
-                       &atmci_regs_fops);
+                                  &atmci_regs_fops);
        if (IS_ERR(node))
                return;
        if (!node)
                goto err;
 
-       node = debugfs_create_file("req", S_IRUSR, root, slot, &atmci_req_fops);
+       node = debugfs_create_file("req", S_IRUSR, root, slot,
+                                  &atmci_req_fops);
        if (!node)
                goto err;
 

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 467d889a16386c26e273a0157ce25787ea6116ce..6094e9e687b10417a258e99d8a1625f1f586a615 100644 (file)
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1652,7 +1652,7 @@ static struct mmc_host_ops omap_hsmmc_ops = {
 
 #ifdef CONFIG_DEBUG_FS
 
-static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
+static int mmc_regs_show(struct seq_file *s, void *data)
 {
        struct mmc_host *mmc = s->private;
        struct omap_hsmmc_host *host = mmc_priv(mmc);
@@ -1691,17 +1691,7 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
        return 0;
 }
 
-static int omap_hsmmc_regs_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, omap_hsmmc_regs_show, inode->i_private);
-}
-
-static const struct file_operations mmc_regs_fops = {
-       .open           = omap_hsmmc_regs_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(mmc_regs);
 
 static void omap_hsmmc_debugfs(struct mmc_host *mmc)
 {

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index e1811ffd7b703230f080abd7ccd8f36cea2917b6..10f5219b3b408fa3232d31498ce21910071f3503 100644 (file)
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1405,18 +1405,7 @@ static int s3cmci_state_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static int s3cmci_state_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, s3cmci_state_show, inode->i_private);
-}
-
-static const struct file_operations s3cmci_fops_state = {
-       .owner          = THIS_MODULE,
-       .open           = s3cmci_state_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(s3cmci_state);
 
 #define DBG_REG(_r) { .addr = S3C2410_SDI##_r, .name = #_r }
 
@@ -1458,18 +1447,7 @@ static int s3cmci_regs_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static int s3cmci_regs_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, s3cmci_regs_show, inode->i_private);
-}
-
-static const struct file_operations s3cmci_fops_regs = {
-       .owner          = THIS_MODULE,
-       .open           = s3cmci_regs_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(s3cmci_regs);
 
 static void s3cmci_debugfs_attach(struct s3cmci_host *host)
 {
@@ -1483,14 +1461,14 @@ static void s3cmci_debugfs_attach(struct s3cmci_host *host)
 
        host->debug_state = debugfs_create_file("state", 0444,
                                                host->debug_root, host,
-                                               &s3cmci_fops_state);
+                                               &s3cmci_state_fops);
 
        if (IS_ERR(host->debug_state))
                dev_err(dev, "failed to create debug state file\n");
 
        host->debug_regs = debugfs_create_file("regs", 0444,
                                               host->debug_root, host,
-                                              &s3cmci_fops_regs);
+                                              &s3cmci_regs_fops);
 
        if (IS_ERR(host->debug_regs))
                dev_err(dev, "failed to create debug regs file\n");