Merge branch 'fixes' into next

[platform/kernel/linux-rpi.git] / drivers / mmc / host / dw_mmc.c

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 5455505..09ed242 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -147,19 +147,7 @@ static int dw_mci_req_show(struct seq_file *s, void *v)
 
        return 0;
 }
-
-static int dw_mci_req_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, dw_mci_req_show, inode->i_private);
-}
-
-static const struct file_operations dw_mci_req_fops = {
-       .owner          = THIS_MODULE,
-       .open           = dw_mci_req_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(dw_mci_req);
 
 static int dw_mci_regs_show(struct seq_file *s, void *v)
 {
@@ -178,19 +166,7 @@ static int dw_mci_regs_show(struct seq_file *s, void *v)
 
        return 0;
 }
-
-static int dw_mci_regs_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, dw_mci_regs_show, inode->i_private);
-}
-
-static const struct file_operations dw_mci_regs_fops = {
-       .owner          = THIS_MODULE,
-       .open           = dw_mci_regs_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(dw_mci_regs);
 
 static void dw_mci_init_debugfs(struct dw_mci_slot *slot)
 {
@@ -2028,7 +2004,6 @@ static void dw_mci_tasklet_func(unsigned long priv)
                        set_bit(EVENT_CMD_COMPLETE, &host->completed_events);
                        err = dw_mci_command_complete(host, cmd);
                        if (cmd == mrq->sbc && !err) {
-                               prev_state = state = STATE_SENDING_CMD;
                                __dw_mci_start_request(host, host->slot,
                                                       mrq->cmd);
                                goto unlock;