Skip to content

ASoC: SOF: remove superfluous initialization#766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Apr 4, 2019
Merged

ASoC: SOF: remove superfluous initialization #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions sound/soc/sof/core.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@
struct snd_sof_pcm *snd_sof_find_spcm_name(struct snd_sof_dev *sdev,
const char *name)
{
struct snd_sof_pcm *spcm = NULL;
struct snd_sof_pcm *spcm;

list_for_each_entry(spcm, &sdev->pcm_list, list) {
/* match with PCM dai name */
Expand All@@ -52,7 +52,7 @@ struct snd_sof_pcm *snd_sof_find_spcm_comp(struct snd_sof_dev *sdev,
unsigned int comp_id,
int *direction)
{
struct snd_sof_pcm *spcm = NULL;
struct snd_sof_pcm *spcm;

list_for_each_entry(spcm, &sdev->pcm_list, list) {
if (spcm->stream[SNDRV_PCM_STREAM_PLAYBACK].comp_id == comp_id) {
Expand All@@ -71,7 +71,7 @@ struct snd_sof_pcm *snd_sof_find_spcm_comp(struct snd_sof_dev *sdev,
struct snd_sof_pcm *snd_sof_find_spcm_pcm_id(struct snd_sof_dev *sdev,
unsigned int pcm_id)
{
struct snd_sof_pcm *spcm = NULL;
struct snd_sof_pcm *spcm;

list_for_each_entry(spcm, &sdev->pcm_list, list) {
if (le32_to_cpu(spcm->pcm.pcm_id) == pcm_id)
Expand All@@ -84,7 +84,7 @@ struct snd_sof_pcm *snd_sof_find_spcm_pcm_id(struct snd_sof_dev *sdev,
struct snd_sof_widget *snd_sof_find_swidget(struct snd_sof_dev *sdev,
char *name)
{
struct snd_sof_widget *swidget = NULL;
struct snd_sof_widget *swidget;

list_for_each_entry(swidget, &sdev->widget_list, list) {
if (strcmp(name, swidget->widget->name) == 0)
Expand All@@ -98,7 +98,7 @@ struct snd_sof_widget *snd_sof_find_swidget(struct snd_sof_dev *sdev,
struct snd_sof_widget *snd_sof_find_swidget_sname(struct snd_sof_dev *sdev,
char *pcm_name, int dir)
{
struct snd_sof_widget *swidget = NULL;
struct snd_sof_widget *swidget;
enum snd_soc_dapm_type type;

if (dir == SNDRV_PCM_STREAM_PLAYBACK)
Expand All@@ -117,7 +117,7 @@ struct snd_sof_widget *snd_sof_find_swidget_sname(struct snd_sof_dev *sdev,
struct snd_sof_dai *snd_sof_find_dai(struct snd_sof_dev *sdev,
char *name)
{
struct snd_sof_dai *dai = NULL;
struct snd_sof_dai *dai;

list_for_each_entry(dai, &sdev->dai_list, list) {
if (dai->name && (strcmp(name, dai->name) == 0))
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/bdw.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -549,7 +549,7 @@ static int bdw_probe(struct snd_sof_dev *sdev)
container_of(sdev->dev, struct platform_device, dev);
struct resource *mmio;
u32 base, size;
int ret = 0;
int ret;

/* LPE base */
mmio = platform_get_resource(pdev, IORESOURCE_MEM,
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sof/intel/byt.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -516,7 +516,7 @@ static int byt_pci_probe(struct snd_sof_dev *sdev)
const struct sof_dev_desc *desc = pdata->desc;
struct pci_dev *pci = to_pci_dev(sdev->dev);
u32 base, size;
int ret = 0;
int ret;

/* DSP DMA can only access low 31 bits of host memory */
ret = dma_coerce_mask_and_coherent(&pci->dev, DMA_BIT_MASK(31));
Expand DownExpand Up@@ -648,7 +648,7 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev)
container_of(sdev->dev, struct platform_device, dev);
struct resource *mmio;
u32 base, size;
int ret = 0;
int ret;

/* DSP DMA can only access low 31 bits of host memory */
ret = dma_coerce_mask_and_coherent(sdev->dev, DMA_BIT_MASK(31));
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda-codec.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,7 +97,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int address)
int hda_codec_probe_bus(struct snd_sof_dev *sdev)
{
struct hdac_bus *bus = sof_to_bus(sdev);
int i, ret = 0;
int i, ret;

/* probe codecs in avail slots */
for (i = 0; i < HDA_MAX_CODECS; i++) {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda-dsp.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, int state)
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
struct hdac_bus *bus = sof_to_bus(sdev);
#endif
int ret = 0;
int ret;

/* disable IPC interrupts */
hda_dsp_ipc_int_disable(sdev);
Expand Down
8 changes: 4 additions & 4 deletions sound/soc/sof/intel/hda-loader.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,18 +27,18 @@ static int cl_stream_prepare(struct snd_sof_dev *sdev, unsigned int format,
unsigned int size, struct snd_dma_buffer *dmab,
int direction)
{
struct hdac_ext_stream *dsp_stream = NULL;
struct hdac_ext_stream *dsp_stream;
Comment thread
ranj063 marked this conversation as resolved.
Outdated
struct hdac_stream *hstream;
struct pci_dev *pci = to_pci_dev(sdev->dev);
int ret;

if (direction == SNDRV_PCM_STREAM_PLAYBACK) {
dsp_stream = hda_dsp_stream_get(sdev, direction);
} else {
if (direction != SNDRV_PCM_STREAM_PLAYBACK) {
dev_err(sdev->dev, "error: code loading DMA is playback only\n");
return -EINVAL;
}

dsp_stream = hda_dsp_stream_get(sdev, direction);

if (!dsp_stream) {
dev_err(sdev->dev, "error: no stream available\n");
return -ENODEV;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda-pcm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ snd_pcm_uframes_t hda_dsp_pcm_pointer(struct snd_sof_dev *sdev,
struct sof_intel_hda_dev *hda =
(struct sof_intel_hda_dev *)sdev->pdata->hw_pdata;
struct snd_sof_pcm *spcm;
snd_pcm_uframes_t pos = 0;
snd_pcm_uframes_t pos;

spcm = snd_sof_find_spcm_dai(sdev, rtd);
if (!spcm) {
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sof/intel/hda-stream.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,14 +131,14 @@ int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev,
int enable, u32 size)
{
struct hdac_stream *hstream = &stream->hstream;
u32 mask = 0;
u32 mask;
Comment thread
ranj063 marked this conversation as resolved.
Outdated
Comment thread
ranj063 marked this conversation as resolved.
Outdated

if (!sdev->bar[HDA_DSP_SPIB_BAR]) {
dev_err(sdev->dev, "error: address of spib capability is NULL\n");
return -EINVAL;
}

mask |= (1 << hstream->index);
mask = (1 << hstream->index);

/* enable/disable SPIB for the stream */
snd_sof_dsp_update_bits(sdev, HDA_DSP_SPIB_BAR,
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -249,9 +249,9 @@ static const char *fixup_tplg_name(struct snd_sof_dev *sdev,
static int hda_init_caps(struct snd_sof_dev *sdev)
{
struct hdac_bus *bus = sof_to_bus(sdev);
struct hdac_ext_link *hlink = NULL;
struct hdac_ext_link *hlink;
struct snd_soc_acpi_mach_params *mach_params;
struct snd_soc_acpi_mach *hda_mach = NULL;
struct snd_soc_acpi_mach *hda_mach;
struct snd_sof_pdata *pdata = sdev->pdata;
struct snd_soc_acpi_mach *mach;
const char *tplg_filename;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hsw.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -549,7 +549,7 @@ static int hsw_probe(struct snd_sof_dev *sdev)
container_of(sdev->dev, struct platform_device, dev);
struct resource *mmio;
u32 base, size;
int ret = 0;
int ret;

/* LPE base */
mmio = platform_get_resource(pdev, IORESOURCE_MEM,
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/ipc.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -669,7 +669,7 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_ipc *ipc,
struct sof_ipc_fw_version *v = &ready->version;
struct sof_ipc_ctrl_data_params sparams;
size_t send_bytes;
int err = 0;
int err;

/* read or write firmware volume */
if (scontrol->readback_offset != 0) {
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/nocodec.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ int sof_nocodec_setup(struct device *dev,
const struct snd_sof_dsp_ops *ops)
{
struct snd_soc_dai_link *links;
int ret = 0;
int ret;

if (!mach)
return -EINVAL;
Expand Down
8 changes: 4 additions & 4 deletions sound/soc/sof/pcm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -354,7 +354,7 @@ static snd_pcm_uframes_t sof_pcm_pointer(struct snd_pcm_substream *substream)
snd_soc_rtdcom_lookup(rtd, DRV_NAME);
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);
struct snd_sof_pcm *spcm;
snd_pcm_uframes_t host = 0, dai = 0;
snd_pcm_uframes_t host, dai;

/* nothing todo for BE */
if (rtd->dai_link->no_pcm)
Expand DownExpand Up@@ -531,7 +531,7 @@ static int sof_pcm_new(struct snd_soc_pcm_runtime *rtd)
struct snd_sof_pcm *spcm;
struct snd_pcm *pcm = rtd->pcm;
struct snd_soc_tplg_stream_caps *caps;
int ret = 0, stream = SNDRV_PCM_STREAM_PLAYBACK;
int stream = SNDRV_PCM_STREAM_PLAYBACK;

/* find SOF PCM for this RTD */
spcm = snd_sof_find_spcm_dai(sdev, rtd);
Expand DownExpand Up@@ -562,7 +562,7 @@ static int sof_pcm_new(struct snd_soc_pcm_runtime *rtd)

/* do we need to pre-allocate capture audio buffer pages */
if (!spcm->pcm.capture)
return ret;
return 0;

caps = &spcm->pcm.caps[stream];

Expand All@@ -575,7 +575,7 @@ static int sof_pcm_new(struct snd_soc_pcm_runtime *rtd)
le32_to_cpu(caps->buffer_size_min),
le32_to_cpu(caps->buffer_size_max));

return ret;
return 0;
}

/* fixup the BE DAI link to match any values from topology */
Expand Down
12 changes: 6 additions & 6 deletions sound/soc/sof/pm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@

static int sof_restore_kcontrols(struct snd_sof_dev *sdev)
{
struct snd_sof_control *scontrol = NULL;
struct snd_sof_control *scontrol;
int ipc_cmd, ctrl_type;
int ret = 0;

Expand DownExpand Up@@ -63,13 +63,13 @@ static int sof_restore_kcontrols(struct snd_sof_dev *sdev)

static int sof_restore_pipelines(struct snd_sof_dev *sdev)
{
struct snd_sof_widget *swidget = NULL;
struct snd_sof_route *sroute = NULL;
struct snd_sof_widget *swidget;
struct snd_sof_route *sroute;
struct sof_ipc_pipe_new *pipeline;
struct snd_sof_dai *dai;
struct sof_ipc_comp_dai *comp_dai;
struct sof_ipc_cmd_hdr *hdr;
int ret = 0;
int ret;

/* restore pipeline components */
list_for_each_entry_reverse(swidget, &sdev->widget_list, list) {
Expand DownExpand Up@@ -242,7 +242,7 @@ static void sof_cache_debugfs(struct snd_sof_dev *sdev)
static int sof_resume(struct device *dev, bool runtime_resume)
{
struct snd_sof_dev *sdev = dev_get_drvdata(dev);
int ret = 0;
int ret;

/* do nothing if dsp resume callbacks are not set */
if (!sof_ops(sdev)->resume || !sof_ops(sdev)->runtime_resume)
Expand DownExpand Up@@ -311,7 +311,7 @@ static int sof_resume(struct device *dev, bool runtime_resume)
static int sof_suspend(struct device *dev, bool runtime_suspend)
{
struct snd_sof_dev *sdev = dev_get_drvdata(dev);
int ret = 0;
int ret;

/* do nothing if dsp suspend callback is not set */
if (!sof_ops(sdev)->suspend)
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/sof/sof-acpi-dev.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ static const struct sof_dev_desc sof_acpi_baytrail_desc = {
static bool is_byt_cr(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
int status = 0;
int status;

if (iosf_mbi_available()) {
u32 bios_status;
Expand DownExpand Up@@ -187,7 +187,7 @@ static int sof_acpi_probe(struct platform_device *pdev)
struct snd_soc_acpi_mach *mach;
struct snd_sof_pdata *sof_pdata;
const struct snd_sof_dsp_ops *ops;
int ret = 0;
int ret;

dev_dbg(&pdev->dev, "ACPI DSP detected");

Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/sof-pci-dev.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -216,7 +216,7 @@ static int sof_pci_probe(struct pci_dev *pci,
struct snd_soc_acpi_mach *mach;
struct snd_sof_pdata *sof_pdata;
const struct snd_sof_dsp_ops *ops;
int ret = 0;
int ret;

dev_dbg(&pci->dev, "PCI DSP detected");

Expand Down
16 changes: 8 additions & 8 deletions sound/soc/sof/topology.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,7 +1024,7 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
struct soc_bytes_ext *sbe;
struct soc_enum *se;
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
struct snd_soc_dobj *dobj = NULL;
struct snd_soc_dobj *dobj;
struct snd_sof_control *scontrol;
int ret = -EINVAL;

Expand DownExpand Up@@ -1342,7 +1342,7 @@ int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,
struct sof_ipc_comp_reply *r)
{
struct sof_ipc_pm_core_config pm_core_config;
int ret = 0;
int ret;

ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,
sizeof(*pipeline), r, sizeof(*r));
Expand DownExpand Up@@ -1727,14 +1727,14 @@ static int sof_process_load(struct snd_soc_component *scomp, int index,
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
struct snd_soc_tplg_private *private = &tw->priv;
struct snd_soc_dapm_widget *widget = swidget->widget;
const struct snd_kcontrol_new *kc = NULL;
const struct snd_kcontrol_new *kc;
Comment thread
ranj063 marked this conversation as resolved.
Outdated
struct soc_bytes_ext *sbe;
struct soc_mixer_control *sm;
struct soc_enum *se;
struct snd_sof_control *scontrol = NULL;
struct sof_abi_hdr *pdata = NULL;
struct sof_ipc_comp_process *process;
size_t ipc_size = 0, ipc_data_size = 0;
size_t ipc_size, ipc_data_size = 0;
int ret, i, offset = 0;

if (type == SOF_COMP_NONE) {
Expand DownExpand Up@@ -1954,7 +1954,7 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
struct snd_sof_widget *swidget;
struct snd_sof_dai *dai;
struct sof_ipc_comp_reply reply;
struct snd_sof_control *scontrol = NULL;
struct snd_sof_control *scontrol;
int ret = 0;

swidget = kzalloc(sizeof(*swidget), GFP_KERNEL);
Expand DownExpand Up@@ -2095,7 +2095,7 @@ static int sof_widget_unload(struct snd_soc_component *scomp,
struct snd_soc_dobj *dobj)
{
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
const struct snd_kcontrol_new *kc = NULL;
const struct snd_kcontrol_new *kc;
struct snd_soc_dapm_widget *widget;
struct sof_ipc_pipe_new *pipeline;
struct snd_sof_control *scontrol;
Expand DownExpand Up@@ -2704,7 +2704,7 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,
struct sof_ipc_dai_config config;
struct snd_soc_tplg_hw_config *hw_config;
int num_hw_configs;
int ret = 0;
int ret;
int i = 0;

link->platform_name = dev_name(sdev->dev);
Expand DownExpand Up@@ -2834,7 +2834,7 @@ static int sof_link_unload(struct snd_soc_component *scomp,
struct snd_soc_dai_link *link =
container_of(dobj, struct snd_soc_dai_link, dobj);

struct snd_sof_dai *sof_dai = NULL;
Comment thread
ranj063 marked this conversation as resolved.
Outdated
struct snd_sof_dai *sof_dai;
int ret = 0;

/* only BE link is loaded by sof */
Expand Down