3 files changed, 16 insertions, 16 deletions

diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c
index 46aa51afec14..c20e5309f8aa 100644
--- a/arch/sparc/prom/memory.c
+++ b/arch/sparc/prom/memory.c
@@ -47,9 +47,9 @@ prom_sortmemlist(struct linux_mlist_v0 *thislist)
         char *tmpaddr;
         char *lowest;
 
-        for(i=0; thislist[i].theres_more != 0; i++) {
+        for(i=0; thislist[i].theres_more; i++) {
                 lowest = thislist[i].start_adr;
-                for(mitr = i+1; thislist[mitr-1].theres_more != 0; mitr++)
+                for(mitr = i+1; thislist[mitr-1].theres_more; mitr++)
                         if(thislist[mitr].start_adr < lowest) {
                                 lowest = thislist[mitr].start_adr;
                                 swapi = mitr;
@@ -85,7 +85,7 @@ void __init prom_meminit(void)
                         prom_phys_total[iter].num_bytes = mptr->num_bytes;
                         prom_phys_total[iter].theres_more = &prom_phys_total[iter+1];
                 }
-                prom_phys_total[iter-1].theres_more = 0x0;
+                prom_phys_total[iter-1].theres_more = NULL;
                 /* Second, the total prom taken descriptors. */
                 for(mptr = (*(romvec->pv_v0mem.v0_prommap)), iter=0;
                     mptr; mptr=mptr->theres_more, iter++) {
@@ -93,7 +93,7 @@ void __init prom_meminit(void)
                         prom_prom_taken[iter].num_bytes = mptr->num_bytes;
                         prom_prom_taken[iter].theres_more = &prom_prom_taken[iter+1];
                 }
-                prom_prom_taken[iter-1].theres_more = 0x0;
+                prom_prom_taken[iter-1].theres_more = NULL;
                 /* Last, the available physical descriptors. */
                 for(mptr = (*(romvec->pv_v0mem.v0_available)), iter=0;
                     mptr; mptr=mptr->theres_more, iter++) {
@@ -101,7 +101,7 @@ void __init prom_meminit(void)
                         prom_phys_avail[iter].num_bytes = mptr->num_bytes;
                         prom_phys_avail[iter].theres_more = &prom_phys_avail[iter+1];
                 }
-                prom_phys_avail[iter-1].theres_more = 0x0;
+                prom_phys_avail[iter-1].theres_more = NULL;
                 /* Sort all the lists. */
                 prom_sortmemlist(prom_phys_total);
                 prom_sortmemlist(prom_prom_taken);
@@ -124,7 +124,7 @@ void __init prom_meminit(void)
                         prom_phys_avail[iter].theres_more =
                                 &prom_phys_avail[iter+1];
                 }
-                prom_phys_avail[iter-1].theres_more = 0x0;
+                prom_phys_avail[iter-1].theres_more = NULL;
 
                 num_regs = prom_getproperty(node, "reg",
                                             (char *) prom_reg_memlist,
@@ -138,7 +138,7 @@ void __init prom_meminit(void)
                         prom_phys_total[iter].theres_more =
                                 &prom_phys_total[iter+1];
                 }
-                prom_phys_total[iter-1].theres_more = 0x0;
+                prom_phys_total[iter-1].theres_more = NULL;
 
                 node = prom_getchild(prom_root_node);
                 node = prom_searchsiblings(node, "virtual-memory");
@@ -158,7 +158,7 @@ void __init prom_meminit(void)
                         prom_prom_taken[iter].theres_more =
                                 &prom_prom_taken[iter+1];
                 }
-                prom_prom_taken[iter-1].theres_more = 0x0;
+                prom_prom_taken[iter-1].theres_more = NULL;
 
                 prom_sortmemlist(prom_prom_taken);
 
@@ -182,15 +182,15 @@ void __init prom_meminit(void)
         case PROM_SUN4:
 #ifdef CONFIG_SUN4      
                 /* how simple :) */
-                prom_phys_total[0].start_adr = 0x0;
+                prom_phys_total[0].start_adr = NULL;
                 prom_phys_total[0].num_bytes = *(sun4_romvec->memorysize);
-                prom_phys_total[0].theres_more = 0x0;
-                prom_prom_taken[0].start_adr = 0x0; 
+                prom_phys_total[0].theres_more = NULL;
+                prom_prom_taken[0].start_adr = NULL; 
                 prom_prom_taken[0].num_bytes = 0x0;
-                prom_prom_taken[0].theres_more = 0x0;
-                prom_phys_avail[0].start_adr = 0x0;
+                prom_prom_taken[0].theres_more = NULL;
+                prom_phys_avail[0].start_adr = NULL;
                 prom_phys_avail[0].num_bytes = *(sun4_romvec->memoryavail);
-                prom_phys_avail[0].theres_more = 0x0;
+                prom_phys_avail[0].theres_more = NULL;
 #endif
                 break;
 
diff --git a/arch/sparc/prom/sun4prom.c b/arch/sparc/prom/sun4prom.c
index 69ca735f0d4e..00390a2652aa 100644
--- a/arch/sparc/prom/sun4prom.c
+++ b/arch/sparc/prom/sun4prom.c
@@ -151,7 +151,7 @@ struct linux_romvec * __init sun4_prom_init(void)
          * have more time, we can teach the penguin to say "By your
          * command" or "Activating turbo boost, Michael". :-)
          */
-        sun4_romvec->setLEDs(0x0);
+        sun4_romvec->setLEDs(NULL);
         
         printk("PROMLIB: Old Sun4 boot PROM monitor %s, romvec version %d\n",
                 sun4_romvec->monid,
diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h
index 780ee7ff9dc3..caf926116506 100644
--- a/include/asm-sparc/floppy.h
+++ b/include/asm-sparc/floppy.h
@@ -227,7 +227,7 @@ static __inline__ void sun_fd_disable_dma(void)
         doing_pdma = 0;
         if (pdma_base) {
                 mmu_unlockarea(pdma_base, pdma_areasize);
-                pdma_base = 0;
+                pdma_base = NULL;
         }
 }