2014-07-14 21:24:32

by Dutt, Sudeep

Subject: [PATCH char-misc-next 0/2] Fix minor issues reported in MIC drivers

Himangi Saraogi (1):
misc: mic: Introduce the managed version of ioremap

Sudeep Dutt (1):
dma: Fix MIC X100 DMA Driver Kconfig option

drivers/dma/Kconfig | 3 +--
drivers/misc/mic/card/mic_x100.c | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)

--
1.8.2.1

2014-07-14 21:24:37

by Dutt, Sudeep

Subject: [PATCH char-misc-next 1/2] misc: mic: Introduce the managed version of ioremap

From: Himangi Saraogi <[email protected]>

This patch moves data allocated using ioremap to managed data
allocated using devm_ioremap and cleans now unnecessary
iounmaps in probe and remove functions. Also the unnecessary
label iounmap is done away with.

Link: https://lkml.org/lkml/2014/6/1/191
Tested-by: Sudeep Dutt <[email protected]>
Signed-off-by: Himangi Saraogi <[email protected]>
---
drivers/misc/mic/card/mic_x100.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/misc/mic/card/mic_x100.c b/drivers/misc/mic/card/mic_x100.c
index 55c9465..9d57545 100644
--- a/drivers/misc/mic/card/mic_x100.c
+++ b/drivers/misc/mic/card/mic_x100.c
@@ -200,7 +200,8 @@ static int __init mic_probe(struct platform_device *pdev)

mdev->mmio.pa = MIC_X100_MMIO_BASE;
mdev->mmio.len = MIC_X100_MMIO_LEN;
- mdev->mmio.va = ioremap(MIC_X100_MMIO_BASE, MIC_X100_MMIO_LEN);
+ mdev->mmio.va = devm_ioremap(&pdev->dev, MIC_X100_MMIO_BASE,
+ MIC_X100_MMIO_LEN);
if (!mdev->mmio.va) {
dev_err(&pdev->dev, "Cannot remap MMIO BAR\n");
rc = -EIO;
@@ -214,7 +215,7 @@ static int __init mic_probe(struct platform_device *pdev)
if (IS_ERR(mdrv->dma_mbdev)) {
rc = PTR_ERR(mdrv->dma_mbdev);
dev_err(&pdev->dev, "mbus_add_device failed rc %d\n", rc);
- goto iounmap;
+ goto done;
}
rc = mic_driver_init(mdrv);
if (rc) {
@@ -225,19 +226,15 @@ done:
return rc;
remove_dma:
mbus_unregister_device(mdrv->dma_mbdev);
-iounmap:
- iounmap(mdev->mmio.va);
return rc;
}

static int mic_remove(struct platform_device *pdev)
{
struct mic_driver *mdrv = &g_drv;
- struct mic_device *mdev = &mdrv->mdev;

mic_driver_uninit(mdrv);
mbus_unregister_device(mdrv->dma_mbdev);
- iounmap(mdev->mmio.va);
return 0;
}

--
1.8.2.1

2014-07-14 21:24:35

by Dutt, Sudeep

Subject: [PATCH char-misc-next 2/2] dma: Fix MIC X100 DMA Driver Kconfig option

Select DMA_ENGINE instead of DMAENGINE and delete the default
line as the default is 'n' anyways.

Link: https://lkml.org/lkml/2014/7/14/90
Reported-by: Paul Bolle <[email protected]>
Signed-off-by: Sudeep Dutt <[email protected]>
---
drivers/dma/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 7c8b8c4..8f6afbf 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -36,8 +36,7 @@ comment "DMA Devices"
config INTEL_MIC_X100_DMA
tristate "Intel MIC X100 DMA Driver"
depends on 64BIT && X86 && INTEL_MIC_BUS
- select DMAENGINE
- default N
+ select DMA_ENGINE
help
This enables DMA support for the Intel Many Integrated Core
(MIC) family of PCIe form factor coprocessor X100 devices that
--
1.8.2.1

2014-07-14 21:30:49

by Paul Bolle

Subject: Re: [PATCH char-misc-next 2/2] dma: Fix MIC X100 DMA Driver Kconfig option

On Mon, 2014-07-14 at 14:23 -0700, Sudeep Dutt wrote:
> Select DMA_ENGINE instead of DMAENGINE and delete the default
> line as the default is 'n' anyways.
>
> Link: https://lkml.org/lkml/2014/7/14/90
> Reported-by: Paul Bolle <[email protected]>
> Signed-off-by: Sudeep Dutt <[email protected]>

Thanks for picking this up!


Paul Bolle