|
@@ -1303,10 +1303,8 @@ static int s3cmci_get_ro(struct mmc_host *mmc)
|
|
if (pdata->no_wprotect)
|
|
if (pdata->no_wprotect)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- ret = s3c2410_gpio_getpin(pdata->gpio_wprotect);
|
|
|
|
-
|
|
|
|
- if (pdata->wprotect_invert)
|
|
|
|
- ret = !ret;
|
|
|
|
|
|
+ ret = gpio_get_value(pdata->gpio_wprotect) ? 1 : 0;
|
|
|
|
+ ret ^= pdata->wprotect_invert;
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
@@ -1655,7 +1653,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
|
|
goto probe_free_irq;
|
|
goto probe_free_irq;
|
|
}
|
|
}
|
|
|
|
|
|
- host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);
|
|
|
|
|
|
+ host->irq_cd = gpio_to_irq(host->pdata->gpio_detect);
|
|
|
|
|
|
if (host->irq_cd >= 0) {
|
|
if (host->irq_cd >= 0) {
|
|
if (request_irq(host->irq_cd, s3cmci_irq_cd,
|
|
if (request_irq(host->irq_cd, s3cmci_irq_cd,
|