From 4e87080f6bcf58e844982ad449c45eef50833a1f Mon Sep 17 00:00:00 2001
From: Per Forlin <per.forlin@linaro.org>
Date: Tue, 13 Sep 2011 23:03:29 +0200
Subject: [PATCH] --- yaml --- r: 270279 b: refs/heads/master c:
 34f5050800d600551cca9bcfb463cc6699d82d04 h: refs/heads/master i:   270277:
 549d898c1704378b2c03430f426324e25dc2a450   270275:
 bb68f5eba74c0e34178f53fb6b79f2c547c85f1c   270271:
 bdb7c70fd4ddedfa399f036d78b2b948ad20f718 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mmc/core/debugfs.c | 29 +++++++++++------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 28d5760e675d..97b4c1055d74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cba00eaa95c1ace1fb511f534b233ae302ccb2e
+refs/heads/master: 34f5050800d600551cca9bcfb463cc6699d82d04
diff --git a/trunk/drivers/mmc/core/debugfs.c b/trunk/drivers/mmc/core/debugfs.c
index 96c603b0526f..da69aac4cc82 100644
--- a/trunk/drivers/mmc/core/debugfs.c
+++ b/trunk/drivers/mmc/core/debugfs.c
@@ -20,6 +20,14 @@
 #include "core.h"
 #include "mmc_ops.h"
 
+#ifdef CONFIG_FAIL_MMC_REQUEST
+
+static DECLARE_FAULT_ATTR(fail_default_attr);
+static char *fail_request;
+module_param(fail_request, charp, 0);
+
+#endif /* CONFIG_FAIL_MMC_REQUEST */
+
 /* The debugfs functions are optimized away when CONFIG_DEBUG_FS isn't set. */
 static int mmc_ios_show(struct seq_file *s, void *data)
 {
@@ -168,23 +176,6 @@ static int mmc_clock_opt_set(void *data, u64 val)
 	return 0;
 }
 
-#ifdef CONFIG_FAIL_MMC_REQUEST
-
-static DECLARE_FAULT_ATTR(fail_mmc_request);
-
-#ifdef KERNEL
-/*
- * Internal function. Pass the boot param fail_mmc_request to
- * the setup fault injection attributes routine.
- */
-static int __init setup_fail_mmc_request(char *str)
-{
-	return setup_fault_attr(&fail_mmc_request, str);
-}
-__setup("fail_mmc_request=", setup_fail_mmc_request);
-#endif /* KERNEL */
-#endif /* CONFIG_FAIL_MMC_REQUEST */
-
 DEFINE_SIMPLE_ATTRIBUTE(mmc_clock_fops, mmc_clock_opt_get, mmc_clock_opt_set,
 	"%llu\n");
 
@@ -216,7 +207,9 @@ void mmc_add_host_debugfs(struct mmc_host *host)
 		goto err_node;
 #endif
 #ifdef CONFIG_FAIL_MMC_REQUEST
-	host->fail_mmc_request = fail_mmc_request;
+	if (fail_request)
+		setup_fault_attr(&fail_default_attr, fail_request);
+	host->fail_mmc_request = fail_default_attr;
 	if (IS_ERR(fault_create_debugfs_attr("fail_mmc_request",
 					     root,
 					     &host->fail_mmc_request)))