Skip to content

Fix/sof coccinelle #453

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 2 commits into from
Dec 17, 2018
Merged

Fix/sof coccinelle #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5792062
ASoC: SOF: nocodec: don't free memory allocated with devm_kzalloc
plbossart Dec 16, 2018
69b4a69
ASoC: SOF: debug: use simple_open()
plbossart Dec 16, 2018
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
9 changes: 1 addition & 8 deletions sound/soc/sof/debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
#include <linux/pm_runtime.h>
#include "sof-priv.h"

static int sof_dfsentry_open(struct inode *inode, struct file *file)
{
file->private_data = inode->i_private;

return 0;
}

static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
size_t count, loff_t *ppos)
{
Expand Down Expand Up @@ -79,7 +72,7 @@ static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
}

static const struct file_operations sof_dfs_fops = {
.open = sof_dfsentry_open,
.open = simple_open,
.read = sof_dfsentry_read,
.llseek = default_llseek,
};
Expand Down
9 changes: 2 additions & 7 deletions sound/soc/sof/nocodec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ int sof_nocodec_setup(struct device *dev,
const struct snd_sof_dsp_ops *ops)
{
struct snd_soc_dai_link *links;
int ret;
int ret = 0;

if (!mach)
return -EINVAL;
Expand All @@ -42,12 +42,7 @@ int sof_nocodec_setup(struct device *dev,

ret = sof_bes_setup(dev, ops, links, ops->num_drv,
&sof_nocodec_card);
if (ret) {
kfree(links);
Copy link

@keyonjie keyonjie Dec 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe Coccinelle will not complain if we change it to 'devm_kfree(dev, links);'
But I like reporting error and stopping probing, leave the devm free to the device freeing itself.

return ret;
}

return 0;
return ret;
}
EXPORT_SYMBOL(sof_nocodec_setup);

Expand Down