From: Randy Dunlap <[email protected]>
Fix some sparse warnings in lirc_bt829.c:
drivers/staging/media/lirc/lirc_bt829.c:174:22: warning: non-ANSI function declaration of function 'poll_main'
drivers/staging/media/lirc/lirc_bt829.c:161:29: warning: Using plain integer as NULL pointer
drivers/staging/media/lirc/lirc_bt829.c:134:35: warning: Using plain integer as NULL pointer
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Leonid Froenchenko <[email protected]>
Cc: Jarod Wilson <[email protected]>
---
drivers/staging/media/lirc/lirc_bt829.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- lnx-35-rc2.orig/drivers/staging/media/lirc/lirc_bt829.c
+++ lnx-35-rc2/drivers/staging/media/lirc/lirc_bt829.c
@@ -131,7 +131,7 @@ int init_module(void)
atir_driver.minor = -1;
atir_driver.code_length = 8;
atir_driver.sample_rate = 10;
- atir_driver.data = 0;
+ atir_driver.data = NULL;
atir_driver.add_to_buf = atir_add_to_buf;
atir_driver.set_use_inc = atir_set_use_inc;
atir_driver.set_use_dec = atir_set_use_dec;
@@ -158,7 +158,7 @@ void cleanup_module(void)
static int atir_init_start(void)
{
pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF, 0x400);
- if (pci_addr_lin == 0) {
+ if (pci_addr_lin == NULL) {
printk(KERN_INFO DRIVER_NAME ": pci mem must be mapped\n");
return 0;
}
@@ -171,7 +171,7 @@ static void cycle_delay(int cycle)
}
-static int poll_main()
+static int poll_main(void)
{
unsigned char status_high, status_low;