[i2c] [PATCH] i2c-pnx: fix interrupt handler, get rid of EARLY config option

[Jean Delvare]

Hi Vitaly,

On Mon, 18 Dec 2006 22:23:37 +0300, Vitaly Wool wrote:
> Hello Jean,
> 
> sending you the $Subject patch for i2c-pnx bus driver as was proposed by David.
> 
>  drivers/i2c/busses/Kconfig   |    9 ---------
>  drivers/i2c/busses/i2c-pnx.c |    7 +------
>  2 files changed, 1 insertion(+), 15 deletions(-)
> 
> Signed-off-by: Vitaly Wool <vitalywool at gmail.com>
> 
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index e1989f3..9367c4c 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -564,13 +564,4 @@ config I2C_PNX
>  	  This driver can also be built as a module.  If so, the module
>  	  will be called i2c-pnx.
>  
> -config I2C_PNX_EARLY
> -	bool "Early initialization for I2C on PNXxxxx"
> -	depends on I2C_PNX=y
> -	help
> -	  Under certain circumstances one may need to make sure I2C on PNXxxxx
> -	  is initialized earlier than some other driver that depends on it
> -	  (for instance, that might be USB in case of PNX4008). With this
> -	  option turned on you can guarantee that.
> -
>  endmenu
> diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
> index de0bca7..17376fe 100644
> --- a/drivers/i2c/busses/i2c-pnx.c
> +++ b/drivers/i2c/busses/i2c-pnx.c
> @@ -305,8 +305,7 @@ static int i2c_pnx_master_rcv(struct i2c
>  	return 0;
>  }
>  
> -static irqreturn_t
> -i2c_pnx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
> +static irqreturn_t i2c_pnx_interrupt(int irq, void *dev_id)
>  {
>  	u32 stat, ctl;
>  	struct i2c_adapter *adap = dev_id;
> @@ -699,10 +698,6 @@ MODULE_AUTHOR("Vitaly Wool, Dennis Koval
>  MODULE_DESCRIPTION("I2C driver for Philips IP3204-based I2C busses");
>  MODULE_LICENSE("GPL");
>  
> -#ifdef CONFIG_I2C_PNX_EARLY
>  /* We need to make sure I2C is initialized before USB */
>  subsys_initcall(i2c_adap_pnx_init);
> -#else
> -mudule_init(i2c_adap_pnx_init);
> -#endif
>  module_exit(i2c_adap_pnx_exit);

Applied, thanks. Will go in 2.6.20

-- 
Jean Delvare