diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2004-10-19 18:34:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-19 18:34:38 -0700 |
| commit | 91db418db52b725be9124888cacc78fe047e4f0b (patch) | |
| tree | 0dd9c0df19bff471c219010e60eb124c4a29585e | |
| parent | 54f9f7782df103d6aa8b273855d32d0049f54beb (diff) | |
[PATCH] m68k: NULL vs. 0 cleanups
A few more NULL vs. 0 cleanups, as detected by sparse.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/m68k/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/m68k/mm/memory.c | 2 | ||||
| -rw-r--r-- | drivers/char/amiserial.c | 12 | ||||
| -rw-r--r-- | include/asm-generic/dma-mapping-broken.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 1d2563e115e4..a28149ef91ca 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -352,7 +352,7 @@ void __init setup_arch(char **cmdline_p) #ifndef CONFIG_SUN3 startmem= m68k_memory[0].addr; endmem = startmem + m68k_memory[0].size; - high_memory = PAGE_OFFSET; + high_memory = (void *)PAGE_OFFSET; for (i = 0; i < m68k_num_memory; i++) { m68k_memory[i].size &= MASK_256K; if (m68k_memory[i].addr < startmem) diff --git a/arch/m68k/mm/memory.c b/arch/m68k/mm/memory.c index 09985ae7fd32..1453a6013721 100644 --- a/arch/m68k/mm/memory.c +++ b/arch/m68k/mm/memory.c @@ -77,7 +77,7 @@ pmd_t *get_pointer_table (void) ptable_desc *new; if (!(page = (void *)get_zeroed_page(GFP_KERNEL))) - return 0; + return NULL; flush_tlb_kernel_page(page); nocache_page(page); diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 2355455786f4..bcf906bb24ff 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c @@ -646,7 +646,7 @@ static int startup(struct async_struct * info) /* * and set the speed of the serial port */ - change_speed(info, 0); + change_speed(info, NULL); info->flags |= ASYNC_INITIALIZED; local_irq_restore(flags); @@ -692,7 +692,7 @@ static void shutdown(struct async_struct * info) if (info->xmit.buf) { free_page((unsigned long) info->xmit.buf); - info->xmit.buf = 0; + info->xmit.buf = NULL; } info->IER = 0; @@ -1206,7 +1206,7 @@ check_and_exit: info->tty->alt_speed = 230400; if ((state->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) info->tty->alt_speed = 460800; - change_speed(info, 0); + change_speed(info, NULL); } } else retval = startup(info); @@ -1561,7 +1561,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) tty_ldisc_flush(tty); tty->closing = 0; info->event = 0; - info->tty = 0; + info->tty = NULL; if (info->blocked_open) { if (info->close_delay) { msleep_interruptible(jiffies_to_msecs(info->close_delay)); @@ -1652,7 +1652,7 @@ static void rs_hangup(struct tty_struct *tty) info->event = 0; state->count = 0; info->flags &= ~ASYNC_NORMAL_ACTIVE; - info->tty = 0; + info->tty = NULL; wake_up_interruptible(&info->open_wait); } @@ -1908,7 +1908,7 @@ static inline int line_info(char *buf, struct serial_state *state) info->magic = SERIAL_MAGIC; info->flags = state->flags; info->quot = 0; - info->tty = 0; + info->tty = NULL; } local_irq_save(flags); status = ciab.pra; diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h index e3185b194c3e..fd9de9502dff 100644 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h @@ -9,7 +9,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag) { BUG(); - return 0; + return NULL; } static inline void |