[2.5 patch] move an unused variable in sis_main.c

[2.5 patch] move an unused variable in sis_main.c

[maximilian attems]

[-- Attachment #1: Type: text/plain, Size: 738 bytes --]

The patch below moves an used variable from drivers/video/sis/sis_main.c

i've tested the compilation with 2.5.74

please apply
maks


--- linux-2.5.74/drivers/video/sis/sis_main.c	Wed Jul  2 22:50:59 2003
+++ linux/drivers/video/sis/sis_main.c	Thu Jul  3 12:06:58 2003
@@ -619,11 +619,11 @@
 	double drate = 0, hrate = 0;
 	int found_mode = 0;
 	int old_mode;
-	unsigned char reg;
 
 	TWDEBUG("Inside do_set_var");
 	
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+	unsigned char reg;
 	inSISIDXREG(SISCR,0x34,reg);
 	if(reg & 0x80) {
 	   printk(KERN_INFO "sisfb: Cannot change display mode, X server is active\n");


---
When your medical records are indexed in Google, something's wrong!
aaron kaplan


[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]

Re: [2.5 patch] move an unused variable in sis_main.c

[Adrian Bunk]

On Thu, Jul 03, 2003 at 12:47:00PM +0200, maximilian attems wrote:
> The patch below moves an used variable from drivers/video/sis/sis_main.c
> 
> i've tested the compilation with 2.5.74
> 
> please apply
> maks
> 
> 
> --- linux-2.5.74/drivers/video/sis/sis_main.c	Wed Jul  2 22:50:59 2003
> +++ linux/drivers/video/sis/sis_main.c	Thu Jul  3 12:06:58 2003
> @@ -619,11 +619,11 @@
>  	double drate = 0, hrate = 0;
>  	int found_mode = 0;
>  	int old_mode;
> -	unsigned char reg;
>  
>  	TWDEBUG("Inside do_set_var");
>  	
>  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
> +	unsigned char reg;
>  	inSISIDXREG(SISCR,0x34,reg);
>  	if(reg & 0x80) {
>  	   printk(KERN_INFO "sisfb: Cannot change display mode, X server is active\n");


If TWDEBUG does anything your patch breaks the compilation on kernel 2.4 
with gcc 2.95 .


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [2.5 patch] move an unused variable in sis_main.c

[maximilian attems]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]


On Thu, 03 Jul 2003, Adrian Bunk wrote:

> 
> If TWDEBUG does anything your patch breaks the compilation on kernel 2.4 
> with gcc 2.95 .
> 
> 


thx for your attention but
TWDEBUG is defined in drivers/video/sis/sis.h

#if 1
#define TWDEBUG(x)
#else
#define TWDEBUG(x) printk(KERN_INFO x "\n");
#endif

please correct me if it breaks one of this macros
maks



[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]

Re: [2.5 patch] move an unused variable in sis_main.c

[Thomas Winischhofer]

The version of sisfb you are dealing with is outdated. James Simmons has 
a newer one, and the absolute current one is on my website.

Thomas

maximilian attems wrote:
> On Thu, 03 Jul 2003, Adrian Bunk wrote:
> 
> 
>>If TWDEBUG does anything your patch breaks the compilation on kernel 2.4 
>>with gcc 2.95 .
>>
>>
> 
> 
> 
> thx for your attention but
> TWDEBUG is defined in drivers/video/sis/sis.h
> 
> #if 1
> #define TWDEBUG(x)
> #else
> #define TWDEBUG(x) printk(KERN_INFO x "\n");
> #endif
> 
> please correct me if it breaks one of this macros
> maks
> 
> 


-- 
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net          http://www.winischhofer.net/
twini AT xfree86 DOT org

Re: [2.5 patch] move an unused variable in sis_main.c

[maximilian attems]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

it's the one in kernel version 2.5.73 !!

On Thu, 03 Jul 2003, Thomas Winischhofer wrote:
> 
> The version of sisfb you are dealing with is outdated. James Simmons has 
> a newer one, and the absolute current one is on my website.

what prevents you from merging?

cu maks


[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]

Re: [2.5 patch] move an unused variable in sis_main.c

[Thomas Winischhofer]

maximilian attems wrote:
> it's the one in kernel version 2.5.73 !!
> 
> On Thu, 03 Jul 2003, Thomas Winischhofer wrote:
> 
>>The version of sisfb you are dealing with is outdated. James Simmons has 
>>a newer one, and the absolute current one is on my website.
> 
> 
> what prevents you from merging?

My name isn't Linus, and James is the maintainer of the fb stuff. Go bug 
him...

Thomas


-- 
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net          http://www.winischhofer.net/
twini AT xfree86 DOT org

Re: [2.5 patch] move an unused variable in sis_main.c

[maximilian attems]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]


On Thu, 03 Jul 2003, Thomas Winischhofer wrote:

> >On Thu, 03 Jul 2003, Thomas Winischhofer wrote:
> >
> >>The version of sisfb you are dealing with is outdated. James Simmons has 
> >>a newer one, and the absolute current one is on my website.
> >
> >
> >what prevents you from merging?
> 
> My name isn't Linus, and James is the maintainer of the fb stuff. Go bug 
> him...
> 

hey i didn't want to bug you, you told me that the version was outdated.
i just wanted to know if there are any blocking technichal issues? :)


a++ maks

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]

Re: [2.5 patch] move an unused variable in sis_main.c

[Thomas Winischhofer]

maximilian attems wrote:
>>>what prevents you from merging?
>>
>>My name isn't Linus, and James is the maintainer of the fb stuff. Go bug 
>>him...
>>
> 
> 
> hey i didn't want to bug you, you told me that the version was outdated.
> i just wanted to know if there are any blocking technichal issues? :)

No offence taken (mutually, I hope :) AFAIK there are no technical 
issues; please ask James what keeps him from doing that.

Thomas

-- 
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net          http://www.winischhofer.net/
twini AT xfree86 DOT org