projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[firefly-linux-kernel-4.4.55.git]
/
sound
/
sh
/
sh_dac_audio.c
diff --git
a/sound/sh/sh_dac_audio.c
b/sound/sh/sh_dac_audio.c
index 0a3394751ed20c3d0d352077a30be7d107b50657..e68c4fc91a0304002537845b4a8b1182ab107258 100644
(file)
--- a/
sound/sh/sh_dac_audio.c
+++ b/
sound/sh/sh_dac_audio.c
@@
-261,7
+261,7
@@
static struct snd_pcm_ops snd_sh_dac_pcm_ops = {
.mmap = snd_pcm_lib_mmap_iomem,
};
.mmap = snd_pcm_lib_mmap_iomem,
};
-static int
__devinit
snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)
+static int snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)
{
int err;
struct snd_pcm *pcm;
{
int err;
struct snd_pcm *pcm;
@@
-346,9
+346,9
@@
static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle)
}
/* create -- chip-specific constructor for the cards components */
}
/* create -- chip-specific constructor for the cards components */
-static int
__devinit
snd_sh_dac_create(struct snd_card *card,
-
struct platform_device *devptr,
-
struct snd_sh_dac **rchip)
+static int snd_sh_dac_create(struct snd_card *card,
+ struct platform_device *devptr,
+ struct snd_sh_dac **rchip)
{
struct snd_sh_dac *chip;
int err;
{
struct snd_sh_dac *chip;
int err;
@@
-392,7
+392,7
@@
static int __devinit snd_sh_dac_create(struct snd_card *card,
}
/* driver .probe -- constructor */
}
/* driver .probe -- constructor */
-static int
__devinit
snd_sh_dac_probe(struct platform_device *devptr)
+static int snd_sh_dac_probe(struct platform_device *devptr)
{
struct snd_sh_dac *chip;
struct snd_card *card;
{
struct snd_sh_dac *chip;
struct snd_card *card;