aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 05:14:39 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:33 -0400
commitdd58c0dd30ac761837b1d0d8cc434c7ec7b2df68 (patch)
treeec7b5c9c5bf853007b648efd6fa377a9db80f5da
parent8e44b29da5300f4698c41b5fd2d1ce52c28e2148 (diff)
eicon: fix sparse integer as NULL pointer warnings
drivers/isdn/hardware/eicon/message.c:745:47: warning: Using plain integer as NULL pointer drivers/isdn/hardware/eicon/message.c:761:45: warning: Using plain integer as NULL pointer drivers/isdn/hardware/eicon/message.c:9122:16: warning: Using plain integer as NULL pointer drivers/isdn/hardware/eicon/message.c:9147:16: warning: Using plain integer as NULL pointer drivers/isdn/hardware/eicon/message.c:9173:14: warning: Using plain integer as NULL pointer drivers/isdn/hardware/eicon/divasmain.c:396:23: warning: Using plain integer as NULL pointer Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Karsten Keil <kkeil@suse.de> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/isdn/hardware/eicon/divasmain.c2
-rw-r--r--drivers/isdn/hardware/eicon/message.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 6d39f9360766..5fcbdccd7a53 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -393,7 +393,7 @@ void diva_free_dma_map(void *hdev, struct _diva_dma_map_entry *pmap)
393 dma_addr_t dma_handle; 393 dma_addr_t dma_handle;
394 void *addr_handle; 394 void *addr_handle;
395 395
396 for (i = 0; (pmap != 0); i++) { 396 for (i = 0; (pmap != NULL); i++) {
397 diva_get_dma_map_entry(pmap, i, &cpu_addr, &phys_addr); 397 diva_get_dma_map_entry(pmap, i, &cpu_addr, &phys_addr);
398 if (!cpu_addr) { 398 if (!cpu_addr) {
399 break; 399 break;
diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
index 1ff98e7eb794..599fed88222d 100644
--- a/drivers/isdn/hardware/eicon/message.c
+++ b/drivers/isdn/hardware/eicon/message.c
@@ -742,7 +742,7 @@ static void start_internal_command (dword Id, PLCI *plci, t_std_internal_comma
742 else 742 else
743 { 743 {
744 i = 1; 744 i = 1;
745 while (plci->internal_command_queue[i] != 0) 745 while (plci->internal_command_queue[i] != NULL)
746 i++; 746 i++;
747 plci->internal_command_queue[i] = command_function; 747 plci->internal_command_queue[i] = command_function;
748 } 748 }
@@ -758,7 +758,7 @@ static void next_internal_command (dword Id, PLCI *plci)
758 758
759 plci->internal_command = 0; 759 plci->internal_command = 0;
760 plci->internal_command_queue[0] = NULL; 760 plci->internal_command_queue[0] = NULL;
761 while (plci->internal_command_queue[1] != 0) 761 while (plci->internal_command_queue[1] != NULL)
762 { 762 {
763 for (i = 0; i < MAX_INTERNAL_COMMAND_LEVELS - 1; i++) 763 for (i = 0; i < MAX_INTERNAL_COMMAND_LEVELS - 1; i++)
764 plci->internal_command_queue[i] = plci->internal_command_queue[i+1]; 764 plci->internal_command_queue[i] = plci->internal_command_queue[i+1];
@@ -9119,7 +9119,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER *a, PLCI *plci, APPL *appl, byte ho
9119 dbug(1,dprintf("AdvSigPlci=0x%x",a->AdvSignalPLCI)); 9119 dbug(1,dprintf("AdvSigPlci=0x%x",a->AdvSignalPLCI));
9120 return 0x2001; /* codec in use by another application */ 9120 return 0x2001; /* codec in use by another application */
9121 } 9121 }
9122 if(plci!=0) 9122 if(plci!=NULL)
9123 { 9123 {
9124 a->AdvSignalPLCI = plci; 9124 a->AdvSignalPLCI = plci;
9125 plci->tel=ADV_VOICE; 9125 plci->tel=ADV_VOICE;
@@ -9144,7 +9144,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER *a, PLCI *plci, APPL *appl, byte ho
9144 } 9144 }
9145 /* indicate D-ch connect if */ 9145 /* indicate D-ch connect if */
9146 } /* codec is connected OK */ 9146 } /* codec is connected OK */
9147 if(plci!=0) 9147 if(plci!=NULL)
9148 { 9148 {
9149 a->AdvSignalPLCI = plci; 9149 a->AdvSignalPLCI = plci;
9150 plci->tel=ADV_VOICE; 9150 plci->tel=ADV_VOICE;
@@ -9170,7 +9170,7 @@ word AdvCodecSupport(DIVA_CAPI_ADAPTER *a, PLCI *plci, APPL *appl, byte ho
9170 { 9170 {
9171 if(hook_listen) return 0x300B; /* Facility not supported */ 9171 if(hook_listen) return 0x300B; /* Facility not supported */
9172 /* no hook with SCOM */ 9172 /* no hook with SCOM */
9173 if(plci!=0) plci->tel = CODEC; 9173 if(plci!=NULL) plci->tel = CODEC;
9174 dbug(1,dprintf("S/SCOM codec")); 9174 dbug(1,dprintf("S/SCOM codec"));
9175 /* first time we use the scom-s codec we must shut down the internal */ 9175 /* first time we use the scom-s codec we must shut down the internal */
9176 /* handset application of the card. This can be done by an assign with */ 9176 /* handset application of the card. This can be done by an assign with */
@@ -14604,7 +14604,7 @@ static void channel_xmit_extended_xon (PLCI * plci) {
14604 int max_ch = ARRAY_SIZE(a->ch_flow_control); 14604 int max_ch = ARRAY_SIZE(a->ch_flow_control);
14605 int i, one_requested = 0; 14605 int i, one_requested = 0;
14606 14606
14607 if ((!plci) || (!plci->Id) || ((a = plci->adapter) == 0)) { 14607 if ((!plci) || (!plci->Id) || ((a = plci->adapter) == NULL)) {
14608 return; 14608 return;
14609 } 14609 }
14610 14610