* [patch] ALSA: asihpi: fix some indenting in snd_card_asihpi_pcm_new()
@ 2014-03-31 7:49 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2014-03-31 7:49 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: Takashi Iwai, Eldad Zack, alsa-devel, kernel-janitors
This used to be a part of a condition until f3d145aac913 ('ALSA: asihpi:
MMAP for non-busmaster cards') but now it's not and we can remove an
indent level.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index e4e42f2..901c949 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1253,11 +1253,12 @@ static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)
num_outstreams, num_instreams, &pcm);
if (err < 0)
return err;
+
/* pointer to ops struct is stored, dont change ops afterwards! */
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
- &snd_card_asihpi_playback_mmap_ops);
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
- &snd_card_asihpi_capture_mmap_ops);
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ &snd_card_asihpi_playback_mmap_ops);
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+ &snd_card_asihpi_capture_mmap_ops);
pcm->private_data = asihpi;
pcm->info_flags = 0;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [patch] ALSA: asihpi: fix some indenting in snd_card_asihpi_pcm_new()
@ 2014-03-31 7:49 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2014-03-31 7:49 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: Takashi Iwai, Eldad Zack, alsa-devel, kernel-janitors
This used to be a part of a condition until f3d145aac913 ('ALSA: asihpi:
MMAP for non-busmaster cards') but now it's not and we can remove an
indent level.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index e4e42f2..901c949 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1253,11 +1253,12 @@ static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)
num_outstreams, num_instreams, &pcm);
if (err < 0)
return err;
+
/* pointer to ops struct is stored, dont change ops afterwards! */
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
- &snd_card_asihpi_playback_mmap_ops);
- snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
- &snd_card_asihpi_capture_mmap_ops);
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
+ &snd_card_asihpi_playback_mmap_ops);
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
+ &snd_card_asihpi_capture_mmap_ops);
pcm->private_data = asihpi;
pcm->info_flags = 0;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch] ALSA: asihpi: fix some indenting in snd_card_asihpi_pcm_new()
2014-03-31 7:49 ` Dan Carpenter
@ 2014-03-31 8:46 ` Takashi Iwai
-1 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2014-03-31 8:46 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Eldad Zack, kernel-janitors, alsa-devel
At Mon, 31 Mar 2014 10:49:15 +0300,
Dan Carpenter wrote:
>
> This used to be a part of a condition until f3d145aac913 ('ALSA: asihpi:
> MMAP for non-busmaster cards') but now it's not and we can remove an
> indent level.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks, applied.
Takashi
>
> diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
> index e4e42f2..901c949 100644
> --- a/sound/pci/asihpi/asihpi.c
> +++ b/sound/pci/asihpi/asihpi.c
> @@ -1253,11 +1253,12 @@ static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)
> num_outstreams, num_instreams, &pcm);
> if (err < 0)
> return err;
> +
> /* pointer to ops struct is stored, dont change ops afterwards! */
> - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
> - &snd_card_asihpi_playback_mmap_ops);
> - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
> - &snd_card_asihpi_capture_mmap_ops);
> + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
> + &snd_card_asihpi_playback_mmap_ops);
> + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
> + &snd_card_asihpi_capture_mmap_ops);
>
> pcm->private_data = asihpi;
> pcm->info_flags = 0;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] ALSA: asihpi: fix some indenting in snd_card_asihpi_pcm_new()
@ 2014-03-31 8:46 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2014-03-31 8:46 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Eldad Zack, kernel-janitors, alsa-devel
At Mon, 31 Mar 2014 10:49:15 +0300,
Dan Carpenter wrote:
>
> This used to be a part of a condition until f3d145aac913 ('ALSA: asihpi:
> MMAP for non-busmaster cards') but now it's not and we can remove an
> indent level.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks, applied.
Takashi
>
> diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
> index e4e42f2..901c949 100644
> --- a/sound/pci/asihpi/asihpi.c
> +++ b/sound/pci/asihpi/asihpi.c
> @@ -1253,11 +1253,12 @@ static int snd_card_asihpi_pcm_new(struct snd_card_asihpi *asihpi, int device)
> num_outstreams, num_instreams, &pcm);
> if (err < 0)
> return err;
> +
> /* pointer to ops struct is stored, dont change ops afterwards! */
> - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
> - &snd_card_asihpi_playback_mmap_ops);
> - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
> - &snd_card_asihpi_capture_mmap_ops);
> + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
> + &snd_card_asihpi_playback_mmap_ops);
> + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
> + &snd_card_asihpi_capture_mmap_ops);
>
> pcm->private_data = asihpi;
> pcm->info_flags = 0;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-31 8:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-31 7:49 [patch] ALSA: asihpi: fix some indenting in snd_card_asihpi_pcm_new() Dan Carpenter
2014-03-31 7:49 ` Dan Carpenter
2014-03-31 8:46 ` Takashi Iwai
2014-03-31 8:46 ` Takashi Iwai
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.