generic: 5.15: rework pending patch

[openwrt/staging/stintel.git] / target / linux / generic / pending-5.15 / 800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch

diff --git a/target/linux/generic/pending-5.15/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch b/target/linux/generic/pending-5.15/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
index 511a9f7555139437b1e0db8dbcdd00e9cbef2a5e..478a2cb27d80143a211491b63130290da45421e9 100644 (file)
--- a/target/linux/generic/pending-5.15/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
+++ b/target/linux/generic/pending-5.15/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch
@@ -50,14 +50,23 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
        if (err)
 --- a/drivers/bcma/main.c
 +++ b/drivers/bcma/main.c
-@@ -241,8 +241,10 @@ void bcma_prepare_core(struct bcma_bus *
+@@ -236,13 +236,17 @@ EXPORT_SYMBOL(bcma_core_irq);
+ 
+ void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
+ {
+-      device_initialize(&core->dev);
++      struct device *dev = &core->dev;
++
++      device_initialize(dev);
+       core->dev.release = bcma_release_core_dev;
        core->dev.bus = &bcma_bus_type;
-       dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
+-      dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
++      dev_set_name(dev, "bcma%d:%d", bus->num, core->core_index);
        core->dev.parent = bus->dev;
 -      if (bus->dev)
 +      if (bus->dev) {
                bcma_of_fill_device(bus->dev, core);
-+              dma_coerce_mask_and_coherent(&core->dev, bus->dev->coherent_dma_mask);
++              dma_coerce_mask_and_coherent(dev, bus->dev->coherent_dma_mask);
 +      }
  
        switch (bus->hosttype) {