[PATCH 1/2] s3cmci: Initialize default platform data no_wprotect and no_detect with 1

[PATCH 1/2] s3cmci: Initialize default platform data no_wprotect and no_detect with 1

[Lars-Peter Clausen]

If no platform_data was givin to the device it's going to use it's default
platform data struct which has all fields initialized to zero.
As a result the driver is going to try to request gpio0 both as write protect
and card detect pin. Which of course will fail and makes the driver unusable

Previously to the introduction of no_wprotect and no_detect the behavior was
to assume that if no platform data was given there is no write protect or card
detect pin.
This patch restores that behavior.
---
 drivers/mmc/host/s3cmci.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index d96e1ab..b9c96cc 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1360,6 +1360,8 @@ static struct mmc_host_ops s3cmci_ops = {
 static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
 	/* This is currently here to avoid a number of if (host->pdata)
 	 * checks. Any zero fields to ensure reasonable defaults are picked. */
+	 .no_wprotect = 1,
+	 .no_detect = 1,
 };
 
 #ifdef CONFIG_CPU_FREQ
-- 
1.5.6.5

[PATCH 2/2] s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin

[Lars-Peter Clausen]

---
 drivers/mmc/host/s3cmci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index b9c96cc..2fdf768 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1179,7 +1179,7 @@ static int s3cmci_card_present(struct mmc_host *mmc)
 	struct s3c24xx_mci_pdata *pdata = host->pdata;
 	int ret;
 
-	if (pdata->gpio_detect == 0)
+	if (pdata->no_detect)
 		return -ENOSYS;
 
 	ret = gpio_get_value(pdata->gpio_detect) ? 0 : 1;
-- 
1.5.6.5

[PATCH 1/2] s3cmci: Initialize default platform data no_wprotect and no_detect with 1

[Lars-Peter Clausen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sergei Shtylyov wrote:
> Hello.
>
> Lars-Peter Clausen wrote:
>
>> If no platform_data was givin to the device it's going to use it's
>> default
>> platform data struct which has all fields initialized to zero.
>> As a result the driver is going to try to request gpio0 both as
>> write protect
>> and card detect pin. Which of course will fail and makes the driver
>> unusable
>>
>> Previously to the introduction of no_wprotect and no_detect the
>> behavior was
>> to assume that if no platform data was given there is no write
>> protect or card
>> detect pin.
>> This patch restores that behavior.
>>  
>
>   The very idea of the default platform data seems dubious...
>
> WBR, Sergei
Hi

Could you please elaborate a bit more what makes you think so? Cause
with my current knowledge I tend to disagree, but I've you'd given an
argument it might had convinced me otherwise. Or if not, I could have
given you a reason why I tend to disagree. :)

- - Lars
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAktW4gsACgkQBX4mSR26RiM1+QCeIDuvTZUL3lkvZ0eX6i98FRR/
gBsAn3L8Lw1cceaqeN+Fst3l965X01Vh
=x4MP
-----END PGP SIGNATURE-----