From: Vinod Koul <vkoul@kernel.org>
To: alsa-devel@alsa-project.org
Cc: Greg KH <gregkh@linuxfoundation.org>,
Sanyog Kale <sanyog.r.kale@intel.com>,
Vinod Koul <vkoul@kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Shreyas NC <shreyas.nc@intel.com>
Subject: [PATCH 09/14] soundwire: intel: more alignment fixes
Date: Thu, 2 May 2019 16:29:25 +0530 [thread overview]
Message-ID: <20190502105930.9889-10-vkoul@kernel.org> (raw)
In-Reply-To: <20190502105930.9889-1-vkoul@kernel.org>
Found few more issues reported checkpatch on code alignment so fix those
as well in the intel module.
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
drivers/soundwire/intel.c | 36 ++++++++++++++---------------
include/linux/soundwire/sdw_intel.h | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 9774dc1e4029..31336b0271b0 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -691,9 +691,9 @@ static int intel_create_dai(struct sdw_cdns *cdns,
return -ENOMEM;
if (type == INTEL_PDI_BD || type == INTEL_PDI_OUT) {
- dais[i].playback.stream_name = kasprintf(GFP_KERNEL,
- "SDW%d Tx%d",
- cdns->instance, i);
+ dais[i].playback.stream_name =
+ kasprintf(GFP_KERNEL, "SDW%d Tx%d",
+ cdns->instance, i);
if (!dais[i].playback.stream_name) {
kfree(dais[i].name);
return -ENOMEM;
@@ -706,9 +706,9 @@ static int intel_create_dai(struct sdw_cdns *cdns,
}
if (type == INTEL_PDI_BD || type == INTEL_PDI_IN) {
- dais[i].capture.stream_name = kasprintf(GFP_KERNEL,
- "SDW%d Rx%d",
- cdns->instance, i);
+ dais[i].capture.stream_name =
+ kasprintf(GFP_KERNEL, "SDW%d Rx%d",
+ cdns->instance, i);
if (!dais[i].capture.stream_name) {
kfree(dais[i].name);
kfree(dais[i].playback.stream_name);
@@ -749,40 +749,40 @@ static int intel_register_dai(struct sdw_intel *sdw)
/* Create PCM DAIs */
stream = &cdns->pcm;
- ret = intel_create_dai(cdns, dais, INTEL_PDI_IN,
- stream->num_in, off, stream->num_ch_in, true);
+ ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, stream->num_in,
+ off, stream->num_ch_in, true);
if (ret)
return ret;
off += cdns->pcm.num_in;
- ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT,
- cdns->pcm.num_out, off, stream->num_ch_out, true);
+ ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, cdns->pcm.num_out,
+ off, stream->num_ch_out, true);
if (ret)
return ret;
off += cdns->pcm.num_out;
- ret = intel_create_dai(cdns, dais, INTEL_PDI_BD,
- cdns->pcm.num_bd, off, stream->num_ch_bd, true);
+ ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pcm.num_bd,
+ off, stream->num_ch_bd, true);
if (ret)
return ret;
/* Create PDM DAIs */
stream = &cdns->pdm;
off += cdns->pcm.num_bd;
- ret = intel_create_dai(cdns, dais, INTEL_PDI_IN,
- cdns->pdm.num_in, off, stream->num_ch_in, false);
+ ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, cdns->pdm.num_in,
+ off, stream->num_ch_in, false);
if (ret)
return ret;
off += cdns->pdm.num_in;
- ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT,
- cdns->pdm.num_out, off, stream->num_ch_out, false);
+ ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, cdns->pdm.num_out,
+ off, stream->num_ch_out, false);
if (ret)
return ret;
off += cdns->pdm.num_bd;
- ret = intel_create_dai(cdns, dais, INTEL_PDI_BD,
- cdns->pdm.num_bd, off, stream->num_ch_bd, false);
+ ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pdm.num_bd,
+ off, stream->num_ch_bd, false);
if (ret)
return ret;
diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h
index 0848f9d38bcb..4d70da45363d 100644
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -11,7 +11,7 @@
*/
struct sdw_intel_ops {
int (*config_stream)(void *arg, void *substream,
- void *dai, void *hw_params, int stream_num);
+ void *dai, void *hw_params, int stream_num);
};
/**
--
2.20.1
next prev parent reply other threads:[~2019-05-02 11:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-02 10:59 [PATCH 00/14] soundwire: more code cleanups Vinod Koul
2019-05-02 10:59 ` [PATCH 01/14] soundwire: fix kconfig help format Vinod Koul
2019-05-02 15:07 ` Greg KH
2019-05-02 15:15 ` Vinod Koul
2019-05-02 15:20 ` Greg KH
2019-05-02 15:15 ` Greg KH
2019-05-02 15:21 ` Vinod Koul
2019-05-02 16:35 ` Greg KH
2019-05-02 10:59 ` [PATCH 02/14] soundwire: fix SPDX license for header files Vinod Koul
2019-05-02 10:59 ` [PATCH 03/14] soundwire: intel: fix SPDX license for header file Vinod Koul
2019-05-02 10:59 ` [PATCH 04/14] soundwire: remove empty line before/after braces Vinod Koul
2019-05-02 10:59 ` [PATCH 05/14] soundwire: cadence: remove empty line after braces Vinod Koul
2019-05-02 10:59 ` [PATCH 06/14] soundwire: intel: " Vinod Koul
2019-05-02 10:59 ` [PATCH 07/14] soundwire: add argument to function definition Vinod Koul
2019-05-02 10:59 ` [PATCH 08/14] soundwire: more alignment fixes Vinod Koul
2019-05-02 10:59 ` Vinod Koul [this message]
2019-05-02 10:59 ` [PATCH 10/14] soundwire: avoid multiple assignments Vinod Koul
2019-05-02 10:59 ` [PATCH 11/14] soundwire: fix more typos Vinod Koul
2019-05-02 10:59 ` [PATCH 12/14] soundwire: wrap macro argument in parenthesis Vinod Koul
2019-05-02 10:59 ` [PATCH 13/14] soundwire: add a blank line between functions Vinod Koul
2019-05-02 10:59 ` [PATCH 14/14] soundwire: remove multiple blank lines Vinod Koul
2019-05-02 15:10 ` [PATCH 00/14] soundwire: more code cleanups Greg KH
2019-05-02 15:19 ` Greg KH
2019-05-02 15:42 ` Pierre-Louis Bossart
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=20190502105930.9889-10-vkoul@kernel.org \
--to=vkoul@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=gregkh@linuxfoundation.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=shreyas.nc@intel.com \
/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: link
Be 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.