diff mbox

mmc: davinci: allow driver to work without DMA resource

Message ID 1359620433-3546-1-git-send-email-prakash.pm@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Manjunathappa, Prakash Jan. 31, 2013, 8:20 a.m. UTC
Do not return probe failure with missing DMA resources,
allow driver to work in PIO mode.
Tested on da850-evm.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
 drivers/mmc/host/davinci_mmc.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

Comments

Sekhar Nori Feb. 1, 2013, 6:57 a.m. UTC | #1
On 1/31/2013 1:50 PM, Manjunathappa, Prakash wrote:
> Do not return probe failure with missing DMA resources,
> allow driver to work in PIO mode.
> Tested on da850-evm.

It will be nice to mention what exactly was tested. rootfs mount? file
create/deletion? mount/unmount?

> Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
> ---
>  drivers/mmc/host/davinci_mmc.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index 2063677..382b79d 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -1190,13 +1190,15 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
>  
>  	r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
>  	if (!r)
> -		goto out;
> -	host->rxdma = r->start;
> +		dev_warn(&pdev->dev, "DMA resource not specified\n");

Why not be specific and call it "RX DMA" instead. Anyone who gets this
error will have to do that anyway since you have now got two identical
error messages.

> +	else
> +		host->rxdma = r->start;
>  
>  	r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
>  	if (!r)
> -		goto out;
> -	host->txdma = r->start;
> +		dev_warn(&pdev->dev, "DMA resource not specified\n");

"TX DMA" here.

Thanks,
Sekhar
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Manjunathappa, Prakash Feb. 4, 2013, 1:27 p.m. UTC | #2
SGkgU2VraGFyLA0KDQpPbiBGcmksIEZlYiAwMSwgMjAxMyBhdCAxMjoyNzowNCwgTm9yaSwgU2Vr
aGFyIHdyb3RlOg0KPiBPbiAxLzMxLzIwMTMgMTo1MCBQTSwgTWFuanVuYXRoYXBwYSwgUHJha2Fz
aCB3cm90ZToNCj4gPiBEbyBub3QgcmV0dXJuIHByb2JlIGZhaWx1cmUgd2l0aCBtaXNzaW5nIERN
QSByZXNvdXJjZXMsDQo+ID4gYWxsb3cgZHJpdmVyIHRvIHdvcmsgaW4gUElPIG1vZGUuDQo+ID4g
VGVzdGVkIG9uIGRhODUwLWV2bS4NCj4gDQo+IEl0IHdpbGwgYmUgbmljZSB0byBtZW50aW9uIHdo
YXQgZXhhY3RseSB3YXMgdGVzdGVkLiByb290ZnMgbW91bnQ/IGZpbGUNCj4gY3JlYXRlL2RlbGV0
aW9uPyBtb3VudC91bm1vdW50Pw0KPiANCg0KQWdyZWVkLCB3aWxsIGFkZCB0ZXN0aW5nIGluZm9y
bWF0aW9uLg0KDQo+ID4gU2lnbmVkLW9mZi1ieTogTWFuanVuYXRoYXBwYSwgUHJha2FzaCA8cHJh
a2FzaC5wbUB0aS5jb20+DQo+ID4gLS0tDQo+ID4gIGRyaXZlcnMvbW1jL2hvc3QvZGF2aW5jaV9t
bWMuYyB8ICAgMTAgKysrKysrLS0tLQ0KPiA+ICAxIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9u
cygrKSwgNCBkZWxldGlvbnMoLSkNCj4gPiANCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tbWMv
aG9zdC9kYXZpbmNpX21tYy5jIGIvZHJpdmVycy9tbWMvaG9zdC9kYXZpbmNpX21tYy5jDQo+ID4g
aW5kZXggMjA2MzY3Ny4uMzgyYjc5ZCAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL21tYy9ob3N0
L2RhdmluY2lfbW1jLmMNCj4gPiArKysgYi9kcml2ZXJzL21tYy9ob3N0L2RhdmluY2lfbW1jLmMN
Cj4gPiBAQCAtMTE5MCwxMyArMTE5MCwxNSBAQCBzdGF0aWMgaW50IF9faW5pdCBkYXZpbmNpX21t
Y3NkX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ID4gIA0KPiA+ICAJciA9
IHBsYXRmb3JtX2dldF9yZXNvdXJjZShwZGV2LCBJT1JFU09VUkNFX0RNQSwgMCk7DQo+ID4gIAlp
ZiAoIXIpDQo+ID4gLQkJZ290byBvdXQ7DQo+ID4gLQlob3N0LT5yeGRtYSA9IHItPnN0YXJ0Ow0K
PiA+ICsJCWRldl93YXJuKCZwZGV2LT5kZXYsICJETUEgcmVzb3VyY2Ugbm90IHNwZWNpZmllZFxu
Iik7DQo+IA0KPiBXaHkgbm90IGJlIHNwZWNpZmljIGFuZCBjYWxsIGl0ICJSWCBETUEiIGluc3Rl
YWQuIEFueW9uZSB3aG8gZ2V0cyB0aGlzDQo+IGVycm9yIHdpbGwgaGF2ZSB0byBkbyB0aGF0IGFu
eXdheSBzaW5jZSB5b3UgaGF2ZSBub3cgZ290IHR3byBpZGVudGljYWwNCj4gZXJyb3IgbWVzc2Fn
ZXMuDQo+IA0KDQpBZ3JlZSwgSSB3aWxsIHNwZWNpZnkuDQoNCj4gPiArCWVsc2UNCj4gPiArCQlo
b3N0LT5yeGRtYSA9IHItPnN0YXJ0Ow0KPiA+ICANCj4gPiAgCXIgPSBwbGF0Zm9ybV9nZXRfcmVz
b3VyY2UocGRldiwgSU9SRVNPVVJDRV9ETUEsIDEpOw0KPiA+ICAJaWYgKCFyKQ0KPiA+IC0JCWdv
dG8gb3V0Ow0KPiA+IC0JaG9zdC0+dHhkbWEgPSByLT5zdGFydDsNCj4gPiArCQlkZXZfd2Fybigm
cGRldi0+ZGV2LCAiRE1BIHJlc291cmNlIG5vdCBzcGVjaWZpZWRcbiIpOw0KPiANCj4gIlRYIERN
QSIgaGVyZS4NCj4gDQoNCkFncmVlIHRvIGZpeCBoZXJlIGFsc28uDQoNClRoYW5rcywNClByYWth
c2gNCg0KPiBUaGFua3MsDQo+IFNla2hhcg0KPiANCg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 2063677..382b79d 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -1190,13 +1190,15 @@  static int __init davinci_mmcsd_probe(struct platform_device *pdev)
 
 	r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
 	if (!r)
-		goto out;
-	host->rxdma = r->start;
+		dev_warn(&pdev->dev, "DMA resource not specified\n");
+	else
+		host->rxdma = r->start;
 
 	r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
 	if (!r)
-		goto out;
-	host->txdma = r->start;
+		dev_warn(&pdev->dev, "DMA resource not specified\n");
+	else
+		host->txdma = r->start;
 
 	host->mem_res = mem;
 	host->base = ioremap(mem->start, mem_size);