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 ARM fixes
[firefly-linux-kernel-4.4.55.git]
/
sound
/
sound_core.c
diff --git
a/sound/sound_core.c
b/sound/sound_core.c
index 5322c50c9617c2f8aa0850b60e873a5caef26c2d..46daca1755028d9ac73a4270deda963a11ef6cc9 100644
(file)
--- a/
sound/sound_core.c
+++ b/
sound/sound_core.c
@@
-170,8
+170,8
@@
static int sound_insert_unit(struct sound_unit **list, const struct file_operati
else
sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
else
sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
-
class_device_create(sound_class, NULL
, MKDEV(SOUND_MAJOR, s->unit_minor),
-
dev,
s->name+6);
+
device_create(sound_class, dev
, MKDEV(SOUND_MAJOR, s->unit_minor),
+ s->name+6);
return r;
fail:
return r;
fail:
@@
-193,7
+193,7
@@
static void sound_remove_unit(struct sound_unit **list, int unit)
p = __sound_remove_unit(list, unit);
spin_unlock(&sound_loader_lock);
if (p) {
p = __sound_remove_unit(list, unit);
spin_unlock(&sound_loader_lock);
if (p) {
-
class_
device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor));
+ device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor));
kfree(p);
}
}
kfree(p);
}
}
@@
-436,7
+436,7
@@
EXPORT_SYMBOL(unregister_sound_dsp);
static int soundcore_open(struct inode *, struct file *);
static int soundcore_open(struct inode *, struct file *);
-static struct file_operations soundcore_fops=
+static
const
struct file_operations soundcore_fops=
{
/* We must have an owner or the module locking fails */
.owner = THIS_MODULE,
{
/* We must have an owner or the module locking fails */
.owner = THIS_MODULE,