[Compile Regression in 2.4.25-pre8][PATCH 29/42]

Kronos
2004-02-02T20:43:51Z

matroxfb_g450.c:134: warning: duplicate `const'
matroxfb_g450.c:135: warning: duplicate `const'
matroxfb_g450.c:561: warning: unused variable `minfo'
matroxfb_maven.c:359: warning: duplicate `const'
matroxfb_maven.c:360: warning: duplicate `const'

Remove const qualifier, it's useless.
Remove unused variable.

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/video/matrox/matroxfb_g450.c linux-2.4/drivers/video/matrox/matroxfb_g450.c
--- linux-2.4-vanilla/drivers/video/matrox/matroxfb_g450.c Fri Jun 13 16:51:37 2003
+++ linux-2.4/drivers/video/matrox/matroxfb_g450.c Sat Jan 31 18:20:31 2004
@@ -128,8 +128,8 @@
}

static void g450_compute_bwlevel(CPMINFO int *bl, int *wl) {
- const int b = ACCESS_FBINFO(altout.tvo_params.brightness) + BLMIN;
- const int c = ACCESS_FBINFO(altout.tvo_params.contrast);
+ int b = ACCESS_FBINFO(altout.tvo_params.brightness) + BLMIN;
+ int c = ACCESS_FBINFO(altout.tvo_params.contrast);

*bl = max(b - c, BLMIN);
*wl = min(b + c, WLMAX);
@@ -558,8 +558,6 @@
}

static int matroxfb_g450_verify_mode(void* md, u_int32_t arg) {
- MINFO_FROM(md);
-
switch (arg) {
case MATROXFB_OUTPUT_MODE_PAL:
case MATROXFB_OUTPUT_MODE_NTSC:
diff -Nru -X dontdiff linux-2.4-vanilla/drivers/video/matrox/matroxfb_maven.c linux-2.4/drivers/video/matrox/matroxfb_maven.c
--- linux-2.4-vanilla/drivers/video/matrox/matroxfb_maven.c Fri Jun 13 16:51:37 2003
+++ linux-2.4/drivers/video/matrox/matroxfb_maven.c Sat Jan 31 18:20:47 2004
@@ -353,8 +353,8 @@

static void maven_compute_bwlevel (const struct maven_data* md,
int *bl, int *wl) {
- const int b = md->primary_head->altout.tvo_params.brightness + BLMIN;
- const int c = md->primary_head->altout.tvo_params.contrast;
+ int b = md->primary_head->altout.tvo_params.brightness + BLMIN;
+ int c = md->primary_head->altout.tvo_params.contrast;

*bl = max(b - c, BLMIN);
*wl = min(b + c, WLMAX);

--
Reply-To: kronos@kronoz.cjb.net
Home: http://kronoz.cjb.net
Una donna sposa un uomo sperando che cambi, e lui non cambiera`. Un
uomo sposa una donna sperando che non cambi, e lei cambiera`.