target/linux/bcm27xx/patches-5.4/950-0974-ASoC-cs42xx8-Only-define-cs42xx8_of_match-once.patch

   1 From e84f00c45ad064f1503d2eb03d7600e59744f0e6 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Tue, 29 Sep 2020 15:03:34 +0100
   4 Subject: [PATCH] ASoC: cs42xx8: Only define cs42xx8_of_match once
   5
   6 cs42xx8.c exports cs42xx8_of_match, so there's no need to redefine it
   7 in cs42xx8-i2c.c - doing so breaks linking when loadable module
   8 support is disabled. It would be tidy to use the exported match table
   9 in cs42xx8.c's of_match_table member, but an imported symbol can't be
  10 used in a module's MODULE_DEVICE_TABLE declaration. Instead, rename
  11 the duplicated declarations so as not to clash.
  12
  13 See: https://github.com/raspberrypi/linux/issues/3873
  14
  15 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  16 ---
  17  sound/soc/codecs/cs42xx8-i2c.c | 6 +++---
  18  1 file changed, 3 insertions(+), 3 deletions(-)
  19
  20 --- a/sound/soc/codecs/cs42xx8-i2c.c
  21 +++ b/sound/soc/codecs/cs42xx8-i2c.c
  22 @@ -45,18 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_
  23  };
  24  MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id);
  25
  26 -const struct of_device_id cs42xx8_of_match[] = {
  27 +const struct of_device_id cs42xx8_i2c_of_match[] = {
  28         { .compatible = "cirrus,cs42448", .data = &cs42448_data, },
  29         { .compatible = "cirrus,cs42888", .data = &cs42888_data, },
  30         { /* sentinel */ }
  31  };
  32 -MODULE_DEVICE_TABLE(of, cs42xx8_of_match);
  33 +MODULE_DEVICE_TABLE(of, cs42xx8_i2c_of_match);
  34
  35  static struct i2c_driver cs42xx8_i2c_driver = {
  36         .driver = {
  37                 .name = "cs42xx8",
  38                 .pm = &cs42xx8_pm,
  39 -               .of_match_table = cs42xx8_of_match,
  40 +               .of_match_table = cs42xx8_i2c_of_match,
  41         },
  42         .probe = cs42xx8_i2c_probe,
  43         .remove = cs42xx8_i2c_remove,