AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-08 09:58:12 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

firmware: tegra: Use consistent return variable name

Browse Source 
Most functions in the BPMP driver use 'err' as the return variable
name but there are a few places that use 'ret'. Let's use 'err' to
be consistent.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Jon Hunter 2020-07-12 11:01:15 +01:00 committed by Thierry Reding
parent 8b08dbb1b1
commit edb2bca2ac
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/firmware/tegra/bpmp-debugfs.c
View File

@ -206,7 +206,7 @@ static int debugfs_show(struct seq_file *m, void *p)
char buf[256]; char buf[256];
const char *filename; const char *filename;
size_t len, nbytes; size_t len, nbytes;
int ret; int err;
filename = get_filename(bpmp, file, buf, sizeof(buf)); filename = get_filename(bpmp, file, buf, sizeof(buf));
if (!filename) if (!filename)
@ -220,24 +220,24 @@ static int debugfs_show(struct seq_file *m, void *p)
datavirt = dma_alloc_coherent(bpmp->dev, datasize, &dataphys, datavirt = dma_alloc_coherent(bpmp->dev, datasize, &dataphys,
GFP_KERNEL | GFP_DMA32); GFP_KERNEL | GFP_DMA32);
if (!datavirt) { if (!datavirt) {
ret = -ENOMEM; err = -ENOMEM;
goto free_namebuf; goto free_namebuf;
} }
len = strlen(filename); len = strlen(filename);
strncpy(namevirt, filename, namesize); strncpy(namevirt, filename, namesize);
ret = mrq_debugfs_read(bpmp, namephys, len, dataphys, datasize, err = mrq_debugfs_read(bpmp, namephys, len, dataphys, datasize,
&nbytes); &nbytes);
if (!ret) if (!err)
seq_write(m, datavirt, nbytes); seq_write(m, datavirt, nbytes);
dma_free_coherent(bpmp->dev, datasize, datavirt, dataphys); dma_free_coherent(bpmp->dev, datasize, datavirt, dataphys);
free_namebuf: free_namebuf:
dma_free_coherent(bpmp->dev, namesize, namevirt, namephys); dma_free_coherent(bpmp->dev, namesize, namevirt, namephys);
return ret; return err;
} }
static int debugfs_open(struct inode *inode, struct file *file) static int debugfs_open(struct inode *inode, struct file *file)
@ -257,7 +257,7 @@ static ssize_t debugfs_store(struct file *file, const char __user *buf,
char fnamebuf[256]; char fnamebuf[256];
const char *filename; const char *filename;
size_t len; size_t len;
int ret; int err;
filename = get_filename(bpmp, file, fnamebuf, sizeof(fnamebuf)); filename = get_filename(bpmp, file, fnamebuf, sizeof(fnamebuf));
if (!filename) if (!filename)
@ -271,7 +271,7 @@ static ssize_t debugfs_store(struct file *file, const char __user *buf,
datavirt = dma_alloc_coherent(bpmp->dev, datasize, &dataphys, datavirt = dma_alloc_coherent(bpmp->dev, datasize, &dataphys,
GFP_KERNEL | GFP_DMA32); GFP_KERNEL | GFP_DMA32);
if (!datavirt) { if (!datavirt) {
ret = -ENOMEM; err = -ENOMEM;
goto free_namebuf; goto free_namebuf;
} }
@ -279,11 +279,11 @@ static ssize_t debugfs_store(struct file *file, const char __user *buf,
strncpy(namevirt, filename, namesize); strncpy(namevirt, filename, namesize);
if (copy_from_user(datavirt, buf, count)) { if (copy_from_user(datavirt, buf, count)) {
ret = -EFAULT; err = -EFAULT;
goto free_databuf; goto free_databuf;
} }
ret = mrq_debugfs_write(bpmp, namephys, len, dataphys, err = mrq_debugfs_write(bpmp, namephys, len, dataphys,
count); count);
free_databuf: free_databuf:
@ -291,7 +291,7 @@ static ssize_t debugfs_store(struct file *file, const char __user *buf,
free_namebuf: free_namebuf:
dma_free_coherent(bpmp->dev, namesize, namevirt, namephys); dma_free_coherent(bpmp->dev, namesize, namevirt, namephys);
return ret ?: count; return err ?: count;
} }
static const struct file_operations debugfs_fops = { static const struct file_operations debugfs_fops = {
@ -380,8 +380,8 @@ int tegra_bpmp_init_debugfs(struct tegra_bpmp *bpmp)
void *virt; void *virt;
const size_t sz = SZ_512K; const size_t sz = SZ_512K;
size_t nbytes; size_t nbytes;
int ret;
struct dentry *root; struct dentry *root;
int err;
if (!tegra_bpmp_mrq_is_supported(bpmp, MRQ_DEBUGFS)) if (!tegra_bpmp_mrq_is_supported(bpmp, MRQ_DEBUGFS))
return 0; return 0;
@ -393,24 +393,24 @@ int tegra_bpmp_init_debugfs(struct tegra_bpmp *bpmp)
virt = dma_alloc_coherent(bpmp->dev, sz, &phys, virt = dma_alloc_coherent(bpmp->dev, sz, &phys,
GFP_KERNEL | GFP_DMA32); GFP_KERNEL | GFP_DMA32);
if (!virt) { if (!virt) {
ret = -ENOMEM; err = -ENOMEM;
goto out; goto out;
} }
ret = mrq_debugfs_dumpdir(bpmp, phys, sz, &nbytes); err = mrq_debugfs_dumpdir(bpmp, phys, sz, &nbytes);
if (ret < 0) { if (err < 0) {
goto free; goto free;
} else if (nbytes > sz) { } else if (nbytes > sz) {
ret = -EINVAL; err = -EINVAL;
goto free; goto free;
} }
ret = create_debugfs_mirror(bpmp, virt, nbytes, root); err = create_debugfs_mirror(bpmp, virt, nbytes, root);
free: free:
dma_free_coherent(bpmp->dev, sz, virt, phys); dma_free_coherent(bpmp->dev, sz, virt, phys);
out: out:
if (ret < 0) if (err < 0)
debugfs_remove(root); debugfs_remove(root);
return ret; return err;
} }

6
drivers/firmware/tegra/bpmp.c
View File

@ -515,10 +515,10 @@ bool tegra_bpmp_mrq_is_supported(struct tegra_bpmp *bpmp, unsigned int mrq)
.size = sizeof(resp), .size = sizeof(resp),
}, },
}; };
int ret; int err;
ret = tegra_bpmp_transfer(bpmp, &msg); err = tegra_bpmp_transfer(bpmp, &msg);
if (ret || msg.rx.ret) if (err || msg.rx.ret)
return false; return false;
return resp.status == 0; return resp.status == 0;