5aed41141b20e9eb2cd5aa4830001baffede1176
[openwrt/staging/blocktrron.git] /
1 From 2b7e7f36062f1967ea9eb87e7c30a884fc7d0254 Mon Sep 17 00:00:00 2001
2 From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
3 Date: Wed, 17 Oct 2018 21:01:54 +0200
4 Subject: [PATCH 467/782] staging: bcm2835-audio: more generic probe function
5 name
6
7 commit 96f3bd8ae6516898c7b411ecb87064bb0dd25415 upstream.
8
9 There will only be one probe function, there is no use for appendig
10 "_dt" the end of the name.
11
12 Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
13 Reviewed-by: Takashi Iwai <tiwai@suse.de>
14 Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
16 ---
17 drivers/staging/vc04_services/bcm2835-audio/bcm2835.c | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
21 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
22 @@ -291,7 +291,7 @@ static int snd_add_child_devices(struct
23 return 0;
24 }
25
26 -static int snd_bcm2835_alsa_probe_dt(struct platform_device *pdev)
27 +static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
28 {
29 struct device *dev = &pdev->dev;
30 u32 numchans;
31 @@ -344,7 +344,7 @@ static const struct of_device_id snd_bcm
32 MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table);
33
34 static struct platform_driver bcm2835_alsa0_driver = {
35 - .probe = snd_bcm2835_alsa_probe_dt,
36 + .probe = snd_bcm2835_alsa_probe,
37 #ifdef CONFIG_PM
38 .suspend = snd_bcm2835_alsa_suspend,
39 .resume = snd_bcm2835_alsa_resume,