Fix up 0/NULL confusion

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index ce97619211488b16ffcefc9190a2cf410c32109e..e007a0816cf470ca995dc22be9e872ca46bd77f4 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -442,7 +442,7 @@ u8 ide_dump_status (ide_drive_t *drive, const char *msg, u8 stat)
                int opcode = 0x100;
 
                spin_lock(&ide_lock);
-               rq = 0;
+               rq = NULL;
                if (HWGROUP(drive))
                        rq = HWGROUP(drive)->rq;
                spin_unlock(&ide_lock);

diff --git a/include/asm-ppc64/checksum.h b/include/asm-ppc64/checksum.h
index 5ae7cdbe8ba82109ade8b46a887a6135902d0816..d22d4469de43143488054b84d74d58ca140b15fd 100644 (file)
--- a/include/asm-ppc64/checksum.h
+++ b/include/asm-ppc64/checksum.h
@@ -84,10 +84,10 @@ static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
 }
 
 #define csum_partial_copy_from_user(src, dst, len, sum, errp)   \
-        csum_partial_copy_generic((src), (dst), (len), (sum), (errp), 0)
+        csum_partial_copy_generic((src), (dst), (len), (sum), (errp), NULL)
 
 #define csum_partial_copy_nocheck(src, dst, len, sum)   \
-        csum_partial_copy_generic((src), (dst), (len), (sum), 0, 0)
+        csum_partial_copy_generic((src), (dst), (len), (sum), NULL, NULL)
 
 static inline u32 csum_tcpudp_nofold(u32 saddr,
                                      u32 daddr,