diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-23 08:27:48 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-23 08:27:48 +0100 |
| commit | f1d77ecc547dc8b42fbe5c4bdb7b339c0eefbe0d (patch) | |
| tree | a95c96304bf3ae6bf6b0de587764c61b7f18783e /sound/firewire/digi00x/digi00x-hwdep.c | |
| parent | 0c0b9e4a96fa2a3a66f9b8ae6367f1c0e091bdc7 (diff) | |
| parent | 9eb5d0e635ebe2f227d591e531d48c6f01c0dd78 (diff) | |
Merge remote-tracking branch 'takashi/for-next' into drm-tip
Diffstat (limited to 'sound/firewire/digi00x/digi00x-hwdep.c')
| -rw-r--r-- | sound/firewire/digi00x/digi00x-hwdep.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sound/firewire/digi00x/digi00x-hwdep.c b/sound/firewire/digi00x/digi00x-hwdep.c index f188e4758fd2..463c6b8e864d 100644 --- a/sound/firewire/digi00x/digi00x-hwdep.c +++ b/sound/firewire/digi00x/digi00x-hwdep.c @@ -173,16 +173,15 @@ static int hwdep_compat_ioctl(struct snd_hwdep *hwdep, struct file *file, #define hwdep_compat_ioctl NULL #endif -static const struct snd_hwdep_ops hwdep_ops = { - .read = hwdep_read, - .release = hwdep_release, - .poll = hwdep_poll, - .ioctl = hwdep_ioctl, - .ioctl_compat = hwdep_compat_ioctl, -}; - int snd_dg00x_create_hwdep_device(struct snd_dg00x *dg00x) { + static const struct snd_hwdep_ops ops = { + .read = hwdep_read, + .release = hwdep_release, + .poll = hwdep_poll, + .ioctl = hwdep_ioctl, + .ioctl_compat = hwdep_compat_ioctl, + }; struct snd_hwdep *hwdep; int err; @@ -192,7 +191,7 @@ int snd_dg00x_create_hwdep_device(struct snd_dg00x *dg00x) strcpy(hwdep->name, "Digi00x"); hwdep->iface = SNDRV_HWDEP_IFACE_FW_DIGI00X; - hwdep->ops = hwdep_ops; + hwdep->ops = ops; hwdep->private_data = dg00x; hwdep->exclusive = true; |