target/linux/generic/backport-5.15/827-v6.3-0004-of-device-Ignore-modalias-of-reused-nodes.patch

   1 From 553bd29700145e1849698985e9800f14e967da49 Mon Sep 17 00:00:00 2001
   2 From: Alexander Stein <alexander.stein@ew.tq-group.com>
   3 Date: Tue, 7 Feb 2023 12:05:29 +0100
   4 Subject: [PATCH] of: device: Ignore modalias of reused nodes
   5
   6 If of_node is reused, do not use that node's modalias. This will hide
   7 the name of the actual device. This is rather prominent in USB glue
   8 drivers creating a platform device for the host controller.
   9
  10 Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
  11 Reviewed-by: Rob Herring <robh@kernel.org>
  12 Link: https://lore.kernel.org/r/20230207110531.1060252-2-alexander.stein@ew.tq-group.com
  13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  14 ---
  15  drivers/of/device.c | 4 ++--
  16  1 file changed, 2 insertions(+), 2 deletions(-)
  17
  18 --- a/drivers/of/device.c
  19 +++ b/drivers/of/device.c
  20 @@ -249,7 +249,7 @@ static ssize_t of_device_get_modalias(st
  21         ssize_t csize;
  22         ssize_t tsize;
  23
  24 -       if ((!dev) || (!dev->of_node))
  25 +       if ((!dev) || (!dev->of_node) || dev->of_node_reused)
  26                 return -ENODEV;
  27
  28         /* Name & Type */
  29 @@ -369,7 +369,7 @@ int of_device_uevent_modalias(struct dev
  30  {
  31         int sl;
  32
  33 -       if ((!dev) || (!dev->of_node))
  34 +       if ((!dev) || (!dev->of_node) || dev->of_node_reused)
  35                 return -ENODEV;
  36
  37         /* Devicetree modalias is tricky, we add it in 2 steps */