Merge tag 'driver-core-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / mmc / host / dw_mmc.c

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 79c55c7b4afd92313b8f818690d9654998613f59..fc9d4d000f97e4342bd0b19ae8834382c9e11289 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -176,11 +176,11 @@ static void dw_mci_init_debugfs(struct dw_mci_slot *slot)
 
        debugfs_create_file("regs", S_IRUSR, root, host, &dw_mci_regs_fops);
        debugfs_create_file("req", S_IRUSR, root, slot, &dw_mci_req_fops);
-       debugfs_create_u32("state", S_IRUSR, root, (u32 *)&host->state);
-       debugfs_create_x32("pending_events", S_IRUSR, root,
-                          (u32 *)&host->pending_events);
-       debugfs_create_x32("completed_events", S_IRUSR, root,
-                          (u32 *)&host->completed_events);
+       debugfs_create_u32("state", S_IRUSR, root, &host->state);
+       debugfs_create_xul("pending_events", S_IRUSR, root,
+                          &host->pending_events);
+       debugfs_create_xul("completed_events", S_IRUSR, root,
+                          &host->completed_events);
 }
 #endif /* defined(CONFIG_DEBUG_FS) */
 
@@ -3441,8 +3441,8 @@ int dw_mci_runtime_resume(struct device *dev)
         * Restore the initial value at FIFOTH register
         * And Invalidate the prev_blksz with zero
         */
-        mci_writel(host, FIFOTH, host->fifoth_val);
-        host->prev_blksz = 0;
+       mci_writel(host, FIFOTH, host->fifoth_val);
+       host->prev_blksz = 0;
 
        /* Put in max timeout */
        mci_writel(host, TMOUT, 0xFFFFFFFF);