Re: [PATCH] : ir253_smc_msg.diff

[Martin Dalecki]

Uz.ytkownik Jean Tourrilhes napisa?:
> ir253_smc_msg.diff :
> ------------------
> 	        <Following patch from Jeff Snyder>
> 	o [CRITICA] Release the proper region and not NULL pointer
> 	o [FEATURE] Fix messages
> 
> 
> diff -u -p linux/drivers/net/irda/smc-ircc.d8.c linux/drivers/net/irda/smc-ircc.c
> --- linux/drivers/net/irda/smc-ircc.d8.c	Fri May  3 18:52:33 2002
> +++ linux/drivers/net/irda/smc-ircc.c	Fri May  3 18:54:44 2002
> @@ -10,6 +10,8 @@
>   * Modified by:   Dag Brattli <[e-mail]>
>   * Modified at:   Tue Jun 26 2001
>   * Modified by:   Stefani Seibold <[e-mail]>
> + * Modified at:   Thur Apr 18 2002
> + * Modified by:   Jeff Snyder <[e-mail]>
>   * 
>   *     Copyright (c) 2001      Stefani Seibold
>   *     Copyright (c) 1999-2001 Dag Brattli
> @@ -539,7 +541,7 @@ static int __init ircc_open(unsigned int
>  	if (ircc_irq < 255) {
>  		if (ircc_irq!=irq)
>  			MESSAGE("%s, Overriding IRQ - chip says %d, using %d\n",
> -				driver_name, self->io->irq, ircc_irq);
> +				driver_name, irq, ircc_irq);
>  		self->io->irq = ircc_irq;
>  	}
>  	else
> @@ -547,13 +549,13 @@ static int __init ircc_open(unsigned int
>  	if (ircc_dma < 255) {
>  		if (ircc_dma!=dma)
>  			MESSAGE("%s, Overriding DMA - chip says %d, using %d\n",
> -				driver_name, self->io->dma, ircc_dma);
> +				driver_name, dma, ircc_dma);
>  		self->io->dma = ircc_dma;
>  	}
>  	else
>  		self->io->dma = dma;
>  
> -	request_region(fir_base, CHIP_IO_EXTENT, driver_name);
> +	request_region(self->io->fir_base, CHIP_IO_EXTENT, driver_name);
>  
>  	/* Initialize QoS for this device */
>  	irda_init_max_qos_capabilies(&irport->qos);
> @@ -1191,10 +1193,9 @@ static int __exit ircc_close(struct ircc
>          outb(IRCC_CFGB_IR, iobase+IRCC_SCE_CFGB);
>  #endif
>  	/* Release the PORT that this driver is using */
> -	IRDA_DEBUG(0, __FUNCTION__ "(), releasing 0x%03x\n", 
> -		   self->io->fir_base);
> +	IRDA_DEBUG(0, __FUNCTION__ "(), releasing 0x%03x\n", iobase);

Should read:
   +     IRDA_DEBUG(0, "%s (), releasin.... ", __FUNCTION__,

due to the fact that newer versions of GCC will be more standard
aheren. Well the motivation is to coalesce all the places
where __FUNCTION__ is used in to one instance of the corresponding
string only.

>