OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

soundwire: intel: more alignment fixes 

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vinod Koul 2019-05-02 16:29:25 +05:30 committed by Greg Kroah-Hartman
parent 62f0cec3b0
commit 1215daee56
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/soundwire/intel.c
View File

@ -691,9 +691,9 @@ static int intel_create_dai(struct sdw_cdns *cdns,
return -ENOMEM; return -ENOMEM;
if (type == INTEL_PDI_BD || type == INTEL_PDI_OUT) { if (type == INTEL_PDI_BD || type == INTEL_PDI_OUT) {
dais[i].playback.stream_name = kasprintf(GFP_KERNEL, dais[i].playback.stream_name =
"SDW%d Tx%d", kasprintf(GFP_KERNEL, "SDW%d Tx%d",
cdns->instance, i); cdns->instance, i);
if (!dais[i].playback.stream_name) { if (!dais[i].playback.stream_name) {
kfree(dais[i].name); kfree(dais[i].name);
return -ENOMEM; return -ENOMEM;
@ -706,9 +706,9 @@ static int intel_create_dai(struct sdw_cdns *cdns,
} }
if (type == INTEL_PDI_BD || type == INTEL_PDI_IN) { if (type == INTEL_PDI_BD || type == INTEL_PDI_IN) {
dais[i].capture.stream_name = kasprintf(GFP_KERNEL, dais[i].capture.stream_name =
"SDW%d Rx%d", kasprintf(GFP_KERNEL, "SDW%d Rx%d",
cdns->instance, i); cdns->instance, i);
if (!dais[i].capture.stream_name) { if (!dais[i].capture.stream_name) {
kfree(dais[i].name); kfree(dais[i].name);
kfree(dais[i].playback.stream_name); kfree(dais[i].playback.stream_name);
@ -749,40 +749,40 @@ static int intel_register_dai(struct sdw_intel *sdw)
/* Create PCM DAIs */ /* Create PCM DAIs */
stream = &cdns->pcm; stream = &cdns->pcm;
ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, stream->num_in,
stream->num_in, off, stream->num_ch_in, true); off, stream->num_ch_in, true);
if (ret) if (ret)
return ret; return ret;
off += cdns->pcm.num_in; off += cdns->pcm.num_in;
ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, cdns->pcm.num_out,
cdns->pcm.num_out, off, stream->num_ch_out, true); off, stream->num_ch_out, true);
if (ret) if (ret)
return ret; return ret;
off += cdns->pcm.num_out; off += cdns->pcm.num_out;
ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pcm.num_bd,
cdns->pcm.num_bd, off, stream->num_ch_bd, true); off, stream->num_ch_bd, true);
if (ret) if (ret)
return ret; return ret;
/* Create PDM DAIs */ /* Create PDM DAIs */
stream = &cdns->pdm; stream = &cdns->pdm;
off += cdns->pcm.num_bd; off += cdns->pcm.num_bd;
ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, ret = intel_create_dai(cdns, dais, INTEL_PDI_IN, cdns->pdm.num_in,
cdns->pdm.num_in, off, stream->num_ch_in, false); off, stream->num_ch_in, false);
if (ret) if (ret)
return ret; return ret;
off += cdns->pdm.num_in; off += cdns->pdm.num_in;
ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, ret = intel_create_dai(cdns, dais, INTEL_PDI_OUT, cdns->pdm.num_out,
cdns->pdm.num_out, off, stream->num_ch_out, false); off, stream->num_ch_out, false);
if (ret) if (ret)
return ret; return ret;
off += cdns->pdm.num_bd; off += cdns->pdm.num_bd;
ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, ret = intel_create_dai(cdns, dais, INTEL_PDI_BD, cdns->pdm.num_bd,
cdns->pdm.num_bd, off, stream->num_ch_bd, false); off, stream->num_ch_bd, false);
if (ret) if (ret)
return ret; return ret;

2
include/linux/soundwire/sdw_intel.h
View File

@ -11,7 +11,7 @@
*/ */
struct sdw_intel_ops { struct sdw_intel_ops {
int (*config_stream)(void *arg, void *substream, int (*config_stream)(void *arg, void *substream,
void *dai, void *hw_params, int stream_num); void *dai, void *hw_params, int stream_num);
}; };
/** /**