Commit 9495b7e9 authored by Ulf Hansson's avatar Ulf Hansson Committed by Greg Kroah-Hartman
Browse files

driver core: platform: Initialize dma_parms for platform devices

It's currently the platform driver's responsibility to initialize the
pointer, dma_parms, for its corresponding struct device. The benefit with
this approach allows us to avoid the initialization and to not waste memory
for the struct device_dma_parameters, as this can be decided on a case by
case basis.

However, it has turned out that this approach is not very practical.  Not
only does it lead to open coding, but also to real errors. In principle
callers of dma_set_max_seg_size() doesn't check the error code, but just
assumes it succeeds.

For these reasons, let's do the initialization from the common platform bus
at the device registration point. This also follows the way the PCI devices
are being managed, see pci_device_add().
Suggested-by: default avatarChristoph Hellwig <>
Cc: <>
Tested-by: default avatarHaibo Chen <>
Reviewed-by: default avatarArnd Bergmann <>
Signed-off-by: default avatarUlf Hansson <>
Reviewed-by: default avatarChristoph Hellwig <>

Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 6a8b55ed
...@@ -380,6 +380,8 @@ struct platform_object { ...@@ -380,6 +380,8 @@ struct platform_object {
*/ */
static void setup_pdev_dma_masks(struct platform_device *pdev) static void setup_pdev_dma_masks(struct platform_device *pdev)
{ {
pdev->dev.dma_parms = &pdev->dma_parms;
if (!pdev->dev.coherent_dma_mask) if (!pdev->dev.coherent_dma_mask)
pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
if (!pdev->dev.dma_mask) { if (!pdev->dev.dma_mask) {
...@@ -25,6 +25,7 @@ struct platform_device { ...@@ -25,6 +25,7 @@ struct platform_device {
bool id_auto; bool id_auto;
struct device dev; struct device dev;
u64 platform_dma_mask; u64 platform_dma_mask;
struct device_dma_parameters dma_parms;
u32 num_resources; u32 num_resources;
struct resource *resource; struct resource *resource;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment