diff options
author | Ken Adams <kadams@nvidia.com> | 2011-09-21 19:12:01 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:03 -0800 |
commit | d03d3fdc6909d8721e6630ef2951326dbdc3700f (patch) | |
tree | 83862bc63adc13a287f5846603a2e3adefde0266 /drivers/video/tegra/host/dev.c | |
parent | bd8008b609e0d3ab34ec93df2844c64c69b72a59 (diff) |
video: tegra: host: fix checkpatch.pl issues
The only warnings left are one for
"./nvhost_cdma.c: 609: WARNING: consider using a completion"
and all "over 80 char line" warnings.
Change-Id: I5aa113dac1deb60570c326976baba96386b041ec
Reviewed-on: http://git-master/r/53842
Reviewed-by: Ken Adams <kadams@nvidia.com>
Tested-by: Ken Adams <kadams@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Jeff Smith <jsmith@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Rebase-Id: R83200f349310910a04705d0f7a94d8163e0666fe
Diffstat (limited to 'drivers/video/tegra/host/dev.c')
-rw-r--r-- | drivers/video/tegra/host/dev.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c index 0a511cb82aa5..0eaf9446b713 100644 --- a/drivers/video/tegra/host/dev.c +++ b/drivers/video/tegra/host/dev.c @@ -35,7 +35,7 @@ #define CREATE_TRACE_POINTS #include <trace/events/nvhost.h> -#include <asm/io.h> +#include <linux/io.h> #include <linux/nvhost.h> #include <linux/nvhost_ioctl.h> @@ -144,7 +144,7 @@ static void add_gather(struct nvhost_channel_userctx *ctx, u32 mem_id, u32 words, u32 offset) { struct nvmap_pinarray_elem *pin; - u32* cur_gather = ctx->cur_gather; + u32 *cur_gather = ctx->cur_gather; pin = &ctx->pinarray[ctx->pinarray_size++]; pin->patch_mem = (u32)nvmap_ref_to_handle(ctx->gather_mem); pin->patch_offset = ((cur_gather + 1) - ctx->gathers) * sizeof(u32); @@ -275,7 +275,7 @@ static ssize_t nvhost_channelwrite(struct file *filp, const char __user *buf, return err; } - return (count - remaining); + return count - remaining; } static int nvhost_ioctl_channel_flush( @@ -481,7 +481,7 @@ static long nvhost_channelctl(struct file *filp, return err; } -static struct file_operations nvhost_channelops = { +static const struct file_operations nvhost_channelops = { .owner = THIS_MODULE, .release = nvhost_channelrelease, .open = nvhost_channelopen, @@ -587,8 +587,7 @@ static int nvhost_ioctl_ctrl_module_mutex( err = nvhost_mutex_try_lock(&ctx->dev->cpuaccess, args->id); if (!err) ctx->mod_locks[args->id] = 1; - } - else if (!args->lock && ctx->mod_locks[args->id]) { + } else if (!args->lock && ctx->mod_locks[args->id]) { if (args->id == 0) nvhost_module_idle(&ctx->dev->mod); else @@ -688,7 +687,7 @@ static long nvhost_ctrlctl(struct file *filp, return err; } -static struct file_operations nvhost_ctrlops = { +static const struct file_operations nvhost_ctrlops = { .owner = THIS_MODULE, .release = nvhost_ctrlrelease, .open = nvhost_ctrlopen, |