clang: Fix static analysis warnings from clang

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

diff --git a/demos/intel_sprite_on.c b/demos/intel_sprite_on.c
index c1d0224..abb6c13 100644 (file)
--- a/demos/intel_sprite_on.c
+++ b/demos/intel_sprite_on.c
@@ -842,6 +842,7 @@ static void ricochet(
         set.flags = I915_SET_COLORKEY_NONE;
         ret = drmCommandWrite(gfx_fd, DRM_I915_SET_SPRITE_COLORKEY, &set,
                       sizeof(set));
+       assert(ret == 0);
 
         // Set up sprite output dimensions, initial position, etc.
         if (out_w > prim_width / 2)

diff --git a/tests/flip_test.c b/tests/flip_test.c
index 6710590..f8a52a9 100644 (file)
--- a/tests/flip_test.c
+++ b/tests/flip_test.c
@@ -264,7 +264,6 @@ static void set_mode(struct test_output *o, int crtc)
                gettimeofday(&now, NULL);
                if (now.tv_sec > end.tv_sec ||
                    (now.tv_sec == end.tv_sec && now.tv_usec >= end.tv_usec)) {
-                       ret = 0;
                        break;
                }
 

diff --git a/tools/intel_forcewaked.c b/tools/intel_forcewaked.c
index 3ab2d6f..a90e73e 100644 (file)
--- a/tools/intel_forcewaked.c
+++ b/tools/intel_forcewaked.c
@@ -89,8 +89,9 @@ int main(int argc, char *argv[])
                if (!is_alive()) {
                        INFO_PRINT("gpu reset? restarting daemon\n");
                        intel_register_access_fini();
-                       ret = intel_register_access_init(intel_get_pci_device(),
-                                                        1);
+                       ret = intel_register_access_init(intel_get_pci_device(), 1);
+                       if (ret)
+                               INFO_PRINT("Reg access init fail\n");
                }
                sleep(1);
        }

diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index e561865..76a2b0b 100644 (file)
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -466,8 +466,6 @@ int main(int argc, char **argv)
                        break;
                }
        }
-       argc -= optind;
-       argv += optind;
 
        pci_dev = intel_get_pci_device();
        devid = pci_dev->device_id;

diff --git a/tools/intel_infoframes.c b/tools/intel_infoframes.c
index f5a4006..d74df64 100644 (file)
--- a/tools/intel_infoframes.c
+++ b/tools/intel_infoframes.c
@@ -381,7 +381,7 @@ static void dump_raw_infoframe(DipInfoFrame *frame)
 static void dump_avi_info(Transcoder transcoder)
 {
        Register reg = get_dip_ctl_reg(transcoder);
-       uint32_t val = INREG(reg);
+       uint32_t val;
        DipFrequency freq;
        DipInfoFrame frame;
 
@@ -427,7 +427,7 @@ static void dump_avi_info(Transcoder transcoder)
 static void dump_vendor_info(Transcoder transcoder)
 {
        Register reg = get_dip_ctl_reg(transcoder);
-       uint32_t val = INREG(reg);
+       uint32_t val;
        DipFrequency freq;
        DipInfoFrame frame;
 
@@ -453,7 +453,7 @@ static void dump_vendor_info(Transcoder transcoder)
 static void dump_gamut_info(Transcoder transcoder)
 {
        Register reg = get_dip_ctl_reg(transcoder);
-       uint32_t val = INREG(reg);
+       uint32_t val;
        DipFrequency freq;
        DipInfoFrame frame;
 
@@ -479,7 +479,7 @@ static void dump_gamut_info(Transcoder transcoder)
 static void dump_spd_info(Transcoder transcoder)
 {
        Register reg = get_dip_ctl_reg(transcoder);
-       uint32_t val = INREG(reg);
+       uint32_t val;
        DipFrequency freq;
        DipInfoFrame frame;
        char vendor[9];
@@ -660,7 +660,7 @@ static int parse_infoframe_option_s(const char *name, const char *s,
 static void change_avi_infoframe(Transcoder transcoder, char *commands)
 {
        Register reg = get_dip_ctl_reg(transcoder);
-       uint32_t val = INREG(reg);
+       uint32_t val;
        DipInfoFrame frame;
        char option[32];
        uint32_t option_val;
@@ -760,7 +760,7 @@ static void change_avi_infoframe(Transcoder transcoder, char *commands)
 static void change_spd_infoframe(Transcoder transcoder, char *commands)
 {
        Register reg = get_dip_ctl_reg(transcoder);
-       uint32_t val = INREG(reg);
+       uint32_t val;
        DipInfoFrame frame;
        char option[16];
        char option_val_s[32];

diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
index b49d967..7564cae 100644 (file)
--- a/tools/intel_reg_dumper.c
+++ b/tools/intel_reg_dumper.c
@@ -2158,7 +2158,7 @@ intel_dump_other_regs(void)
                } else {
                        n = ((fp >> 16) & 0x3f);
                        m2 = ((fp >> 0) & 0x3f);
-                       m = 5 * (m1 + 2) + (m2 + 2);
+                       //m = 5 * (m1 + 2) + (m2 + 2);
                        dot =
                            (ref * (5 * (m1 + 2) + (m2 + 2)) / (n + 2)) / (p1 *
                                                                           p2);