You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 0b7d959b0d0c18959c66696844a1c9956370ab99 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Date: Wed, 17 Oct 2018 21:01:54 +0200
|
|
Subject: [PATCH] staging: bcm2835-audio: more generic probe function
|
|
name
|
|
|
|
commit 96f3bd8ae6516898c7b411ecb87064bb0dd25415 upstream.
|
|
|
|
There will only be one probe function, there is no use for appendig
|
|
"_dt" the end of the name.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Takashi Iwai <tiwai@suse.de>
|
|
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/vc04_services/bcm2835-audio/bcm2835.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
|
|
@@ -291,7 +291,7 @@ static int snd_add_child_devices(struct
|
|
return 0;
|
|
}
|
|
|
|
-static int snd_bcm2835_alsa_probe_dt(struct platform_device *pdev)
|
|
+static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
u32 numchans;
|
|
@@ -344,7 +344,7 @@ static const struct of_device_id snd_bcm
|
|
MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table);
|
|
|
|
static struct platform_driver bcm2835_alsa0_driver = {
|
|
- .probe = snd_bcm2835_alsa_probe_dt,
|
|
+ .probe = snd_bcm2835_alsa_probe,
|
|
#ifdef CONFIG_PM
|
|
.suspend = snd_bcm2835_alsa_suspend,
|
|
.resume = snd_bcm2835_alsa_resume,
|