mcb: Add a dma_device to mcb_device

When performing DMA operations on a MCB device, the device needed
for using the DMA API is "mcb_device->bus_carrier".
This is rather lengthy, so a shortcut is introduced to struct mcb_device
in order to ensure the MCB device driver uses the correct device for DMA
operations.

Signed-off-by: Michael Moese <michael.moese@men.de>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c
index 5306966efc11d04a8c56a8f9a2d2a1d44ebed743..921a5d2a802bf45dd97f9c1a8a603656715e679d 100644 (file)
--- a/drivers/mcb/mcb-core.c
+++ b/drivers/mcb/mcb-core.c
@@ -233,6 +233,7 @@ int mcb_device_register(struct mcb_bus *bus, struct mcb_device *dev)
        dev->dev.bus = &mcb_bus_type;
        dev->dev.parent = bus->dev.parent;
        dev->dev.release = mcb_release_dev;
+       dev->dma_dev = bus->carrier;
 
        device_id = dev->id;
        dev_set_name(&dev->dev, "mcb%d-16z%03d-%d:%d:%d",

diff --git a/include/linux/mcb.h b/include/linux/mcb.h
index ee5200d660b0ad2d47f7ebf80c5e752f7b95873b..4097ac9ea13accda06500a7605a4ca8a3632112f 100644 (file)
--- a/include/linux/mcb.h
+++ b/include/linux/mcb.h
@@ -76,6 +76,7 @@ struct mcb_device {
        int rev;
        struct resource irq;
        struct resource mem;
+       struct device *dma_dev;
 };
 
 static inline struct mcb_device *to_mcb_device(struct device *dev)