[PATCH] staging/vt6655: pointer to driver_data needs to be type long

[PATCH] staging/vt6655: pointer to driver_data needs to be type long

[Fernando Luis Vázquez Cao]

Fix the compilation error below while at it.

drivers/staging/vt6655/device_main.c:347: warning: cast from pointer to integer of different size
drivers/staging/vt6655/device_main.c:347: error: initializer element is not constant
drivers/staging/vt6655/device_main.c:347: error: (near initialization for ‘device_id_table[0].driver_data’)

Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
---

diff -urNp linux-2.6.31-rc1-orig/drivers/staging/vt6655/device_main.c linux-2.6.31-rc1/drivers/staging/vt6655/device_main.c
--- linux-2.6.31-rc1-orig/drivers/staging/vt6655/device_main.c	2009-06-26 10:58:19.752045244 +0900
+++ linux-2.6.31-rc1/drivers/staging/vt6655/device_main.c	2009-06-26 10:47:43.954543595 +0900
@@ -344,7 +344,7 @@ static CHIP_INFO chip_info_table[]= {
  };

  static struct pci_device_id device_id_table[] __devinitdata = {
-{ 0x1106, 0x3253, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (int)&chip_info_table[0]},
+{ 0x1106, 0x3253, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long)&chip_info_table[0]},
  { 0, }
  };
  #endif

Re: [PATCH] staging/vt6655: pointer to driver_data needs to be type long

[Greg KH]

On Fri, Jun 26, 2009 at 11:12:12AM +0900, Fernando Luis Vázquez Cao wrote:
> Fix the compilation error below while at it.
> 
> drivers/staging/vt6655/device_main.c:347: warning: cast from pointer to integer of different size
> drivers/staging/vt6655/device_main.c:347: error: initializer element is not constant
> drivers/staging/vt6655/device_main.c:347: error: (near initialization for ‘device_id_table[0].driver_data’)
> 
> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>

This patch doesn't apply :(

Care to resync off of tomorrow's linux-next tree?

thanks,

greg k-h

Re: [PATCH] staging/vt6655: pointer to driver_data needs to be type long

[Fernando Luis Vázquez Cao]

Greg KH wrote:
> On Fri, Jun 26, 2009 at 11:12:12AM +0900, Fernando Luis Vázquez Cao wrote:
>> Fix the compilation error below while at it.
>>
>> drivers/staging/vt6655/device_main.c:347: warning: cast from pointer to integer of different size
>> drivers/staging/vt6655/device_main.c:347: error: initializer element is not constant
>> drivers/staging/vt6655/device_main.c:347: error: (near initialization for ‘device_id_table[0].driver_data’)
>>
>> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> 
> This patch doesn't apply :(
> 
> Care to resync off of tomorrow's linux-next tree?

It seems that a patch from Alan Cox (linux-next: 38d257422fb010e11180fc9c5794812f390aca74)
which fixes this issue got merged first, so mine is not needed anymore if you are planning
to send the fix to Linus before the next merge window. What are your plans?

Thanks,

Fernando

Re: [PATCH] staging/vt6655: pointer to driver_data needs to be type long

[Greg KH]

On Fri, Jul 03, 2009 at 10:41:18AM +0900, Fernando Luis Vázquez Cao wrote:
> Greg KH wrote:
> > On Fri, Jun 26, 2009 at 11:12:12AM +0900, Fernando Luis Vázquez Cao wrote:
> >> Fix the compilation error below while at it.
> >>
> >> drivers/staging/vt6655/device_main.c:347: warning: cast from pointer to integer of different size
> >> drivers/staging/vt6655/device_main.c:347: error: initializer element is not constant
> >> drivers/staging/vt6655/device_main.c:347: error: (near initialization for ‘device_id_table[0].driver_data’)
> >>
> >> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> > 
> > This patch doesn't apply :(
> > 
> > Care to resync off of tomorrow's linux-next tree?
> 
> It seems that a patch from Alan Cox (linux-next: 38d257422fb010e11180fc9c5794812f390aca74)
> which fixes this issue got merged first, so mine is not needed anymore if you are planning
> to send the fix to Linus before the next merge window. What are your plans?

Ok, i'll stick with Alan's fix for now.

thanks,

greg k-h