History

drm/i915: drop unnecessary local variable to suppress build warning

Although I could not reproduce this (different compiler version, perhaps), reportedly we get: drivers/gpu/drm/i915/i915_irq.c:1943:27: warning: ‘score’ may be used uninitialized in this function [-Wuninitialized] Drop the 'score' variable altogether as it's not really needed.

Jani Nikula committed 13 years ago

Commit ea04cb31 parent f2f4d821 file · +3 −7Browse files

Unified · Split

drivers/gpu/drm/i915/i915_irq.c+3−7
@@ -1905,8 +1905,6 @@ static void i915_hangcheck_elapsed(unsigned long data) · 1904 unmodified lines
1905 } else1905 } else
1906 busy = false;1906 busy = false;
1907 } else {1907 } else {
1908 int score;
1909
1910 /* We always increment the hangcheck score1908 /* We always increment the hangcheck score
1911 * if the ring is busy and still processing1909 * if the ring is busy and still processing
1912 * the same request, so that no single request1910 * the same request, so that no single request
@@ -1927,20 +1925,18 @@ static void i915_hangcheck_elapsed(unsigned long data) · 14 unmodified lines
1927 1925
1928 switch (ring->hangcheck.action) {1926 switch (ring->hangcheck.action) {
1929 case HANGCHECK_WAIT:1927 case HANGCHECK_WAIT:
1930 score = 0;
1931 break;1928 break;
1932 case HANGCHECK_ACTIVE:1929 case HANGCHECK_ACTIVE:
1933 score = BUSY;1930 ring->hangcheck.score += BUSY;
1934 break;1931 break;
1935 case HANGCHECK_KICK:1932 case HANGCHECK_KICK:
1936 score = KICK;1933 ring->hangcheck.score += KICK;
1937 break;1934 break;
1938 case HANGCHECK_HUNG:1935 case HANGCHECK_HUNG:
1939 score = HUNG;1936 ring->hangcheck.score += HUNG;
1940 stuck[i] = true;1937 stuck[i] = true;
1941 break;1938 break;
1942 }1939 }
1943 ring->hangcheck.score += score;
1944 }1940 }
1945 } else {1941 } else {
1946 /* Gradually reduce the count so that we catch DoS1942 /* Gradually reduce the count so that we catch DoS

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t