From: Takashi Iwai <tiwai@suse.de> To: linux-media@vger.kernel.org Cc: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.de>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Mauro Carvalho Chehab <mchehab@kernel.org> Subject: [PATCH for-5.6 11/14] media: cobalt: Drop superfluous ioctl PCM ops Date: Tue, 10 Dec 2019 14:58:46 +0100 [thread overview] Message-ID: <20191210135849.15607-12-tiwai@suse.de> (raw) In-Reply-To: <20191210135849.15607-1-tiwai@suse.de> snd_cobalt_pcm_ioctl() does nothing but calling the default handler. Now PCM core accepts NULL as the default ioctl ops, so let's drop altogether. Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/media/pci/cobalt/cobalt-alsa-pcm.c b/drivers/media/pci/cobalt/cobalt-alsa-pcm.c index 77570a1127c9..9e7504e3cfd8 100644 --- a/drivers/media/pci/cobalt/cobalt-alsa-pcm.c +++ b/drivers/media/pci/cobalt/cobalt-alsa-pcm.c @@ -237,12 +237,6 @@ static int snd_cobalt_pcm_capture_close(struct snd_pcm_substream *substream) return 0; } -static int snd_cobalt_pcm_ioctl(struct snd_pcm_substream *substream, - unsigned int cmd, void *arg) -{ - return snd_pcm_lib_ioctl(substream, cmd, arg); -} - static int snd_cobalt_pcm_prepare(struct snd_pcm_substream *substream) { struct snd_cobalt_card *cobsc = snd_pcm_substream_chip(substream); @@ -450,7 +444,6 @@ snd_pcm_uframes_t snd_cobalt_pcm_pb_pointer(struct snd_pcm_substream *substream) static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = { .open = snd_cobalt_pcm_capture_open, .close = snd_cobalt_pcm_capture_close, - .ioctl = snd_cobalt_pcm_ioctl, .prepare = snd_cobalt_pcm_prepare, .trigger = snd_cobalt_pcm_trigger, .pointer = snd_cobalt_pcm_pointer, @@ -459,7 +452,6 @@ static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = { static const struct snd_pcm_ops snd_cobalt_pcm_playback_ops = { .open = snd_cobalt_pcm_playback_open, .close = snd_cobalt_pcm_playback_close, - .ioctl = snd_cobalt_pcm_ioctl, .prepare = snd_cobalt_pcm_pb_prepare, .trigger = snd_cobalt_pcm_pb_trigger, .pointer = snd_cobalt_pcm_pb_pointer, -- 2.16.4
WARNING: multiple messages have this Message-ID (diff)
From: Takashi Iwai <tiwai@suse.de> To: linux-media@vger.kernel.org Cc: Takashi Iwai <tiwai@suse.de>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, alsa-devel@alsa-project.org, Mauro Carvalho Chehab <mchehab@kernel.org> Subject: [alsa-devel] [PATCH for-5.6 11/14] media: cobalt: Drop superfluous ioctl PCM ops Date: Tue, 10 Dec 2019 14:58:46 +0100 [thread overview] Message-ID: <20191210135849.15607-12-tiwai@suse.de> (raw) In-Reply-To: <20191210135849.15607-1-tiwai@suse.de> snd_cobalt_pcm_ioctl() does nothing but calling the default handler. Now PCM core accepts NULL as the default ioctl ops, so let's drop altogether. Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/media/pci/cobalt/cobalt-alsa-pcm.c b/drivers/media/pci/cobalt/cobalt-alsa-pcm.c index 77570a1127c9..9e7504e3cfd8 100644 --- a/drivers/media/pci/cobalt/cobalt-alsa-pcm.c +++ b/drivers/media/pci/cobalt/cobalt-alsa-pcm.c @@ -237,12 +237,6 @@ static int snd_cobalt_pcm_capture_close(struct snd_pcm_substream *substream) return 0; } -static int snd_cobalt_pcm_ioctl(struct snd_pcm_substream *substream, - unsigned int cmd, void *arg) -{ - return snd_pcm_lib_ioctl(substream, cmd, arg); -} - static int snd_cobalt_pcm_prepare(struct snd_pcm_substream *substream) { struct snd_cobalt_card *cobsc = snd_pcm_substream_chip(substream); @@ -450,7 +444,6 @@ snd_pcm_uframes_t snd_cobalt_pcm_pb_pointer(struct snd_pcm_substream *substream) static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = { .open = snd_cobalt_pcm_capture_open, .close = snd_cobalt_pcm_capture_close, - .ioctl = snd_cobalt_pcm_ioctl, .prepare = snd_cobalt_pcm_prepare, .trigger = snd_cobalt_pcm_trigger, .pointer = snd_cobalt_pcm_pointer, @@ -459,7 +452,6 @@ static const struct snd_pcm_ops snd_cobalt_pcm_capture_ops = { static const struct snd_pcm_ops snd_cobalt_pcm_playback_ops = { .open = snd_cobalt_pcm_playback_open, .close = snd_cobalt_pcm_playback_close, - .ioctl = snd_cobalt_pcm_ioctl, .prepare = snd_cobalt_pcm_pb_prepare, .trigger = snd_cobalt_pcm_pb_trigger, .pointer = snd_cobalt_pcm_pb_pointer, -- 2.16.4 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-12-10 13:59 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-10 13:58 [PATCH for-5.6 00/14] media: ALSA PCM API updates Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 01/14] media: solo6x10: Use managed buffer allocation Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-16 23:42 ` Ismael Luceno 2019-12-16 23:42 ` [alsa-devel] " Ismael Luceno 2019-12-10 13:58 ` [PATCH for-5.6 02/14] media: tw686x: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 03/14] media: usbtv: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 04/14] media: cobalt: Clean up ALSA PCM API usages Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 05/14] media: cx18: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 06/14] media: ivtv: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 07/14] media: cs231xx: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 08/14] media: em28xx: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 09/14] media: go7007: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 10/14] media: tm6000: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` Takashi Iwai [this message] 2019-12-10 13:58 ` [alsa-devel] [PATCH for-5.6 11/14] media: cobalt: Drop superfluous ioctl PCM ops Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 12/14] media: cx18: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 13/14] media: ivtv: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-10 13:58 ` [PATCH for-5.6 14/14] media: " Takashi Iwai 2019-12-10 13:58 ` [alsa-devel] " Takashi Iwai 2019-12-16 23:43 ` Ismael Luceno 2019-12-16 23:43 ` [alsa-devel] " Ismael Luceno
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191210135849.15607-12-tiwai@suse.de \ --to=tiwai@suse.de \ --cc=alsa-devel@alsa-project.org \ --cc=hverkuil-cisco@xs4all.nl \ --cc=linux-media@vger.kernel.org \ --cc=mchehab@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.