From: Boris BREZILLON Date: Mon, 22 Sep 2014 19:37:55 +0000 (+0200) Subject: mfd: Inherit coherent_dma_mask from parent device X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4f08df1b06bb4022fab5a2a916f455915856ed9e;p=deliverable%2Flinux.git mfd: Inherit coherent_dma_mask from parent device dma_mask and dma_parms are already inherited from the parent device but dma_coherent_mask was left uninitialized (set to zero thanks to kzalloc). Set sub-device coherent_dma_mask to its parent value to simplify sub-drivers making use of dma coherent helper functions (those drivers currently have to explicitly set the dma coherent mask using dma_set_coherent_mask function). Signed-off-by: Boris BREZILLON Acked-by: Arnd Bergmann Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index 892d343193ad..5d0fbe1e097a 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c @@ -101,6 +101,7 @@ static int mfd_add_device(struct device *parent, int id, pdev->dev.type = &mfd_dev_type; pdev->dev.dma_mask = parent->dma_mask; pdev->dev.dma_parms = parent->dma_parms; + pdev->dev.coherent_dma_mask = parent->coherent_dma_mask; ret = regulator_bulk_register_supply_alias( &pdev->dev, cell->parent_supplies,