diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2012-03-12 18:42:28 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-03-19 08:23:16 -0700 |
| commit | 7ac06f1c4755a05ceec5736ce6c6d4e6cb76f007 (patch) | |
| tree | f689f58c7b6b1826a1fd04566e56717c55a89398 /drivers/video | |
| parent | 426e2e24840dc42aff8b172c8cb4e34f67a468e3 (diff) | |
video: tegra: clean-up warnings and code style
fix some build warnings and bad code style.
Change-Id: I907296ce0e5437dfd6acd0b2b3c119b6dbde7b1c
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/89634
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 9 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/nvsd.c | 5 | ||||
| -rw-r--r-- | drivers/video/tegra/fb.c | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 0644678e7584..4cb5053d35a3 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -1071,7 +1071,9 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) ret = switch_dev_register(&hdmi->hpd_switch); if (!ret) - device_create_file(hdmi->hpd_switch.dev, &dev_attr_underscan); + ret = device_create_file(hdmi->hpd_switch.dev, + &dev_attr_underscan); + BUG_ON(ret != 0); #endif dc->out->depth = 24; @@ -1080,13 +1082,12 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) dc_hdmi = hdmi; /* boards can select default content protection policy */ - if (dc->out->flags & TEGRA_DC_OUT_NVHDCP_POLICY_ON_DEMAND) { + if (dc->out->flags & TEGRA_DC_OUT_NVHDCP_POLICY_ON_DEMAND) tegra_nvhdcp_set_policy(hdmi->nvhdcp, TEGRA_NVHDCP_POLICY_ON_DEMAND); - } else { + else tegra_nvhdcp_set_policy(hdmi->nvhdcp, TEGRA_NVHDCP_POLICY_ALWAYS_ON); - } tegra_dc_hdmi_debug_create(hdmi); diff --git a/drivers/video/tegra/dc/nvsd.c b/drivers/video/tegra/dc/nvsd.c index 2f9faf931e40..a2f3ece6ae77 100644 --- a/drivers/video/tegra/dc/nvsd.c +++ b/drivers/video/tegra/dc/nvsd.c @@ -156,18 +156,19 @@ static bool nvsd_phase_in_adjustments(struct tegra_dc *dc, /* Phase in Backlight and Pixel K every ADJ_PHASE_STEP frames*/ - if (step-- & ADJ_PHASE_STEP == ADJ_PHASE_STEP) { + if ((step-- & ADJ_PHASE_STEP) == ADJ_PHASE_STEP) { if (val != cur_sd_brightness) val > cur_sd_brightness ? (cur_sd_brightness++) : (cur_sd_brightness--); - if (target_k != cur_k) + if (target_k != cur_k) { if (target_k > cur_k) cur_k += K_STEP; else cur_k -= K_STEP; + } /* Set manual k value */ man_k = SD_MAN_K_R(cur_k) | diff --git a/drivers/video/tegra/fb.c b/drivers/video/tegra/fb.c index a3654d73e496..7bc3ab06c47f 100644 --- a/drivers/video/tegra/fb.c +++ b/drivers/video/tegra/fb.c @@ -229,6 +229,7 @@ static int tegra_fb_setcmap(struct fb_cmap *cmap, struct fb_info *info) return 0; } +#if defined(CONFIG_FRAMEBUFFER_CONSOLE) static void tegra_fb_flip_win(struct tegra_fb_info *tegra_fb) { struct tegra_dc_win *win = tegra_fb->win; @@ -271,6 +272,7 @@ static void tegra_fb_flip_win(struct tegra_fb_info *tegra_fb) tegra_dc_update_windows(&tegra_fb->win, 1); tegra_dc_sync_windows(&tegra_fb->win, 1); } +#endif static int tegra_fb_blank(int blank, struct fb_info *info) { |