[alsa-devel] [PATCH 0/2] ASoC: Intel: skylake - match braces for if-else
Coding style mandates that if-else should match braces even if one of them is a single line statement. Fix it in two places missed earlier
Mark, you can also fold these two patches with SKL driver series (1st and 2nd patch can fold in 1st and 2nd patch respectively) or apply independetly, either way okay
Vinod Koul (2): ASoC: Intel: skl-pcm.c match braces for if-else ASoC: Intel: skl.c match braces for if-else
sound/soc/intel/skylake/skl-pcm.c | 3 ++- sound/soc/intel/skylake/skl.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
Coding style madates that if-else should match braces even if one of them is a single line statement
Signed-off-by: Vinod Koul vinod.koul@intel.com --- sound/soc/intel/skylake/skl-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index c8adaabdef12..1011d88d6e32 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -845,8 +845,9 @@ static int skl_get_time_info(struct snd_pcm_substream *substream, audio_tstamp_report->accuracy_report = 1; /* rest of struct is valid */ audio_tstamp_report->accuracy = 42; /* 24MHzWallClk == 42ns resolution */
- } else + } else { audio_tstamp_report->actual_type = SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT; + }
return 0; }
Coding style madates that if-else should match braces even if one of them is a single line statement
Signed-off-by: Vinod Koul vinod.koul@intel.com --- sound/soc/intel/skylake/skl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 0ab02af0325a..1e70e3962c76 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -394,9 +394,9 @@ static int skl_first_init(struct hdac_ext_bus *ebus) dev_dbg(bus->dev, "chipset global capabilities = 0x%x\n", gcap);
/* allow 64bit DMA address if supported by H/W */ - if (!dma_set_mask(bus->dev, DMA_BIT_MASK(64))) + if (!dma_set_mask(bus->dev, DMA_BIT_MASK(64))) { dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(64)); - else { + } else { dma_set_mask(bus->dev, DMA_BIT_MASK(32)); dma_set_coherent_mask(bus->dev, DMA_BIT_MASK(32)); }
On Tue, Jun 23, 2015 at 10:40:11PM +0530, Vinod Koul wrote:
Coding style mandates that if-else should match braces even if one of them is a single line statement. Fix it in two places missed earlier
Mark, you can also fold these two patches with SKL driver series (1st and 2nd patch can fold in 1st and 2nd patch respectively) or apply independetly, either way okay
I really don't know what that series is any more, sorry. I've got two pending serieses both identified as Sky Lake and sent after this one.
On Wed, Jul 08, 2015 at 07:27:23PM +0100, Mark Brown wrote:
On Tue, Jun 23, 2015 at 10:40:11PM +0530, Vinod Koul wrote:
Coding style mandates that if-else should match braces even if one of them is a single line statement. Fix it in two places missed earlier
Mark, you can also fold these two patches with SKL driver series (1st and 2nd patch can fold in 1st and 2nd patch respectively) or apply independetly, either way okay
I really don't know what that series is any more, sorry. I've got two pending serieses both identified as Sky Lake and sent after this one.
Hi Mark,
For the last series you said you were okay but had noticed some style inconsistencies, so I fixed those with this. The updated patchset (rebased) has these folded in, so this can be ignored.
participants (2)
-
Mark Brown -
Vinod Koul