aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/nvidia/nvidia.c
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-01-13 14:46:27 +0000
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2020-01-15 17:31:53 +0100
commite4eed858357a94438fa5e3c5839c7b597acdb688 (patch)
tree2e4ae34c0d5e699909b6625be6cd6c1f4e677cb5 /drivers/video/fbdev/nvidia/nvidia.c
parentfbdev: remove object duplication in Makefile (diff)
downloadlinux-dev-e4eed858357a94438fa5e3c5839c7b597acdb688.tar.xz
linux-dev-e4eed858357a94438fa5e3c5839c7b597acdb688.zip
video: fbdev: nvidia: clean up indentation issues and comment block
There is a hunk of code that is incorrectly indented, clean up the indentation and a comment block. Also remove block braces around a one line statement on an if condition and add missing spaces after if keywords. Signed-off-by: Colin Ian King <colin.king@canonical.com> Cc: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200113144627.219967-1-colin.king@canonical.com
Diffstat (limited to 'drivers/video/fbdev/nvidia/nvidia.c')
-rw-r--r--drivers/video/fbdev/nvidia/nvidia.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
index c583c018304d..c24de9107958 100644
--- a/drivers/video/fbdev/nvidia/nvidia.c
+++ b/drivers/video/fbdev/nvidia/nvidia.c
@@ -168,27 +168,26 @@ static int nvidia_panel_tweak(struct nvidia_par *par,
{
int tweak = 0;
- if (par->paneltweak) {
- tweak = par->paneltweak;
- } else {
- /* begin flat panel hacks */
- /* This is unfortunate, but some chips need this register
- tweaked or else you get artifacts where adjacent pixels are
- swapped. There are no hard rules for what to set here so all
- we can do is experiment and apply hacks. */
-
- if(((par->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) {
- /* At least one NV34 laptop needs this workaround. */
- tweak = -1;
- }
-
- if((par->Chipset & 0xfff0) == 0x0310) {
- tweak = 1;
- }
- /* end flat panel hacks */
- }
-
- return tweak;
+ if (par->paneltweak) {
+ tweak = par->paneltweak;
+ } else {
+ /* Begin flat panel hacks.
+ * This is unfortunate, but some chips need this register
+ * tweaked or else you get artifacts where adjacent pixels are
+ * swapped. There are no hard rules for what to set here so all
+ * we can do is experiment and apply hacks.
+ */
+ if (((par->Chipset & 0xffff) == 0x0328) && (state->bpp == 32)) {
+ /* At least one NV34 laptop needs this workaround. */
+ tweak = -1;
+ }
+
+ if ((par->Chipset & 0xfff0) == 0x0310)
+ tweak = 1;
+ /* end flat panel hacks */
+ }
+
+ return tweak;
}
static void nvidia_screen_off(struct nvidia_par *par, int on)