1 From 6ebd83ad7b2bff00ad3e25811c38e73bb4201b07 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Thu, 9 Feb 2017 14:40:33 +0000
4 Subject: [PATCH] sound: Suppress error message about deferrals
6 Since driver load deferrals are expected and will already
7 have resulted in a kernel message, suppress an essentially
8 duplicate error message from the RPi audio board drivers.
10 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
12 sound/soc/bcm/adau1977-adc.c | 2 +-
13 sound/soc/bcm/allo-piano-dac.c | 2 +-
14 sound/soc/bcm/digidac1-soundcard.c | 4 ++--
15 sound/soc/bcm/dionaudio_loco.c | 2 +-
16 sound/soc/bcm/hifiberry_amp.c | 3 +--
17 sound/soc/bcm/hifiberry_dac.c | 2 +-
18 sound/soc/bcm/hifiberry_dacplus.c | 2 +-
19 sound/soc/bcm/hifiberry_digi.c | 2 +-
20 sound/soc/bcm/iqaudio-dac.c | 5 +++--
21 sound/soc/bcm/iqaudio_digi.c | 2 +-
22 sound/soc/bcm/justboom-dac.c | 2 +-
23 sound/soc/bcm/justboom-digi.c | 2 +-
24 sound/soc/bcm/pisound.c | 3 ++-
25 sound/soc/bcm/raspidac3.c | 2 +-
26 sound/soc/bcm/rpi-dac.c | 2 +-
27 sound/soc/bcm/rpi-proto.c | 3 +--
28 16 files changed, 20 insertions(+), 20 deletions(-)
30 --- a/sound/soc/bcm/adau1977-adc.c
31 +++ b/sound/soc/bcm/adau1977-adc.c
32 @@ -90,7 +90,7 @@ static int snd_adau1977_adc_probe(struct
35 ret = snd_soc_register_card(&snd_adau1977_adc);
37 + if (ret && ret != -EPROBE_DEFER)
38 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
41 --- a/sound/soc/bcm/allo-piano-dac.c
42 +++ b/sound/soc/bcm/allo-piano-dac.c
43 @@ -109,7 +109,7 @@ static int snd_allo_piano_dac_probe(stru
46 ret = snd_soc_register_card(&snd_allo_piano_dac);
48 + if (ret && ret != -EPROBE_DEFER)
50 "snd_soc_register_card() failed: %d\n", ret);
52 --- a/sound/soc/bcm/digidac1-soundcard.c
53 +++ b/sound/soc/bcm/digidac1-soundcard.c
54 @@ -387,9 +387,9 @@ static int digidac1_soundcard_probe(stru
57 ret = snd_soc_register_card(&digidac1_soundcard);
59 + if (ret && ret != -EPROBE_DEFER)
60 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
66 --- a/sound/soc/bcm/dionaudio_loco.c
67 +++ b/sound/soc/bcm/dionaudio_loco.c
68 @@ -86,7 +86,7 @@ static int snd_rpi_dionaudio_loco_probe(
71 ret = snd_soc_register_card(&snd_rpi_dionaudio_loco);
73 + if (ret && ret != -EPROBE_DEFER)
74 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
77 --- a/sound/soc/bcm/hifiberry_amp.c
78 +++ b/sound/soc/bcm/hifiberry_amp.c
79 @@ -96,9 +96,8 @@ static int snd_rpi_hifiberry_amp_probe(s
81 ret = snd_soc_register_card(&snd_rpi_hifiberry_amp);
84 + if (ret && ret != -EPROBE_DEFER)
85 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
90 --- a/sound/soc/bcm/hifiberry_dac.c
91 +++ b/sound/soc/bcm/hifiberry_dac.c
92 @@ -90,7 +90,7 @@ static int snd_rpi_hifiberry_dac_probe(s
95 ret = snd_soc_register_card(&snd_rpi_hifiberry_dac);
97 + if (ret && ret != -EPROBE_DEFER)
98 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
101 --- a/sound/soc/bcm/hifiberry_dacplus.c
102 +++ b/sound/soc/bcm/hifiberry_dacplus.c
103 @@ -324,7 +324,7 @@ static int snd_rpi_hifiberry_dacplus_pro
106 ret = snd_soc_register_card(&snd_rpi_hifiberry_dacplus);
108 + if (ret && ret != -EPROBE_DEFER)
110 "snd_soc_register_card() failed: %d\n", ret);
112 --- a/sound/soc/bcm/hifiberry_digi.c
113 +++ b/sound/soc/bcm/hifiberry_digi.c
114 @@ -242,7 +242,7 @@ static int snd_rpi_hifiberry_digi_probe(
117 ret = snd_soc_register_card(&snd_rpi_hifiberry_digi);
119 + if (ret && ret != -EPROBE_DEFER)
120 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
123 --- a/sound/soc/bcm/iqaudio-dac.c
124 +++ b/sound/soc/bcm/iqaudio-dac.c
125 @@ -197,8 +197,9 @@ static int snd_rpi_iqaudio_dac_probe(str
127 ret = snd_soc_register_card(&snd_rpi_iqaudio_dac);
129 - dev_err(&pdev->dev,
130 - "snd_soc_register_card() failed: %d\n", ret);
131 + if (ret != -EPROBE_DEFER)
132 + dev_err(&pdev->dev,
133 + "snd_soc_register_card() failed: %d\n", ret);
137 --- a/sound/soc/bcm/iqaudio_digi.c
138 +++ b/sound/soc/bcm/iqaudio_digi.c
139 @@ -204,7 +204,7 @@ static int snd_rpi_iqaudio_digi_probe(st
142 ret = snd_soc_register_card(card);
144 + if (ret && ret != -EPROBE_DEFER)
145 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
148 --- a/sound/soc/bcm/justboom-dac.c
149 +++ b/sound/soc/bcm/justboom-dac.c
150 @@ -128,7 +128,7 @@ static int snd_rpi_justboom_dac_probe(st
153 ret = snd_soc_register_card(&snd_rpi_justboom_dac);
155 + if (ret && ret != -EPROBE_DEFER)
157 "snd_soc_register_card() failed: %d\n", ret);
159 --- a/sound/soc/bcm/justboom-digi.c
160 +++ b/sound/soc/bcm/justboom-digi.c
161 @@ -181,7 +181,7 @@ static int snd_rpi_justboom_digi_probe(s
164 ret = snd_soc_register_card(&snd_rpi_justboom_digi);
166 + if (ret && ret != -EPROBE_DEFER)
168 "snd_soc_register_card() failed: %d\n", ret);
170 --- a/sound/soc/bcm/pisound.c
171 +++ b/sound/soc/bcm/pisound.c
172 @@ -1076,7 +1076,8 @@ static int pisnd_probe(struct platform_d
173 ret = snd_soc_register_card(&pisnd_card);
176 - printe("snd_soc_register_card() failed: %d\n", ret);
177 + if (ret != -EPROBE_DEFER)
178 + printe("snd_soc_register_card() failed: %d\n", ret);
180 kobject_put(pisnd_kobj);
182 --- a/sound/soc/bcm/raspidac3.c
183 +++ b/sound/soc/bcm/raspidac3.c
184 @@ -149,7 +149,7 @@ static int snd_rpi_raspidac3_probe(struc
187 ret = snd_soc_register_card(&snd_rpi_raspidac3);
189 + if (ret && ret != -EPROBE_DEFER)
191 "snd_soc_register_card() failed: %d\n", ret);
193 --- a/sound/soc/bcm/rpi-dac.c
194 +++ b/sound/soc/bcm/rpi-dac.c
195 @@ -85,7 +85,7 @@ static int snd_rpi_rpi_dac_probe(struct
198 ret = snd_soc_register_card(&snd_rpi_rpi_dac);
200 + if (ret && ret != -EPROBE_DEFER)
201 dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
204 --- a/sound/soc/bcm/rpi-proto.c
205 +++ b/sound/soc/bcm/rpi-proto.c
206 @@ -117,10 +117,9 @@ static int snd_rpi_proto_probe(struct pl
209 ret = snd_soc_register_card(&snd_rpi_proto);
211 + if (ret && ret != -EPROBE_DEFER)
213 "snd_soc_register_card() failed: %d\n", ret);