PCM core deals the empty ioctl field now as default. Let's kill the redundant lines.
Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/sparc/amd7930.c | 2 -- sound/sparc/cs4231.c | 2 -- sound/sparc/dbri.c | 1 - 3 files changed, 5 deletions(-)
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index d39973605cca..df1b16c97d16 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -726,7 +726,6 @@ static int snd_amd7930_capture_close(struct snd_pcm_substream *substream) static const struct snd_pcm_ops snd_amd7930_playback_ops = { .open = snd_amd7930_playback_open, .close = snd_amd7930_playback_close, - .ioctl = snd_pcm_lib_ioctl, .prepare = snd_amd7930_playback_prepare, .trigger = snd_amd7930_playback_trigger, .pointer = snd_amd7930_playback_pointer, @@ -735,7 +734,6 @@ static const struct snd_pcm_ops snd_amd7930_playback_ops = { static const struct snd_pcm_ops snd_amd7930_capture_ops = { .open = snd_amd7930_capture_open, .close = snd_amd7930_capture_close, - .ioctl = snd_pcm_lib_ioctl, .prepare = snd_amd7930_capture_prepare, .trigger = snd_amd7930_capture_trigger, .pointer = snd_amd7930_capture_pointer, diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 874da942b662..1676d44769ad 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -1193,7 +1193,6 @@ static int snd_cs4231_capture_close(struct snd_pcm_substream *substream) static const struct snd_pcm_ops snd_cs4231_playback_ops = { .open = snd_cs4231_playback_open, .close = snd_cs4231_playback_close, - .ioctl = snd_pcm_lib_ioctl, .hw_params = snd_cs4231_playback_hw_params, .prepare = snd_cs4231_playback_prepare, .trigger = snd_cs4231_trigger, @@ -1203,7 +1202,6 @@ static const struct snd_pcm_ops snd_cs4231_playback_ops = { static const struct snd_pcm_ops snd_cs4231_capture_ops = { .open = snd_cs4231_capture_open, .close = snd_cs4231_capture_close, - .ioctl = snd_pcm_lib_ioctl, .hw_params = snd_cs4231_capture_hw_params, .prepare = snd_cs4231_capture_prepare, .trigger = snd_cs4231_trigger, diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 315d5a04a33e..1390a52d6cfd 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -2215,7 +2215,6 @@ static snd_pcm_uframes_t snd_dbri_pointer(struct snd_pcm_substream *substream) static const struct snd_pcm_ops snd_dbri_ops = { .open = snd_dbri_open, .close = snd_dbri_close, - .ioctl = snd_pcm_lib_ioctl, .hw_params = snd_dbri_hw_params, .hw_free = snd_dbri_hw_free, .prepare = snd_dbri_prepare,