diff for duplicates of <1327642391.4846.36.camel@joe2Laptop> diff --git a/a/1.txt b/N1/1.txt index 4a53e2c..37a8b38 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -151,7 +151,7 @@ index 8eca55d..61393b8 100644 r = 0; @@ -341,7 +341,7 @@ static int smd_pkt_release(struct inode *inode, struct file *file) mutex_lock(&smd_pkt_devp->ch_lock); - if (--smd_pkt_devp->open_count = 0) { + if (--smd_pkt_devp->open_count == 0) { r = smd_close(smd_pkt_devp->ch); - smd_pkt_devp->ch = 0; + smd_pkt_devp->ch = NULL; @@ -442,7 +442,7 @@ index e08b21c..a802829 100644 return -ENOMEM; } @@ -54,7 +54,7 @@ int s5p_mfc_alloc_dec_temp_buffers(struct s5p_mfc_ctx *ctx) - if (desc_virt = NULL) { + if (desc_virt == NULL) { vb2_dma_contig_memops.put(ctx->desc_buf); ctx->desc_phys = 0; - ctx->desc_buf = 0; @@ -712,7 +712,7 @@ index 49b549f..0bef109 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c @@ -393,7 +393,7 @@ static void pasemi_mac_setup_csrings(struct pasemi_mac *mac) - if (mac->type = MAC_TYPE_XAUI) + if (mac->type == MAC_TYPE_XAUI) mac->cs[1] = pasemi_mac_setup_csring(mac); else - mac->cs[1] = 0; @@ -796,7 +796,7 @@ index 04a154f..0e2533a 100644 } #endif instance = scsi_register(host, sizeof(struct NCR5380_hostdata)); - if (instance = NULL) { + if (instance == NULL) { atari_stram_free(atari_dma_buffer); - atari_dma_buffer = 0; + atari_dma_buffer = NULL; @@ -993,7 +993,8 @@ index 6a79ba1..ad738e1 100644 /* Channel specific range and maxdata */ - dev->subdevices[i].range_table = 0; + dev->subdevices[i].range_table = NULL; - dev->subdevices[i].range_table_list p->range_table_list; + dev->subdevices[i].range_table_list = + p->range_table_list; dev->subdevices[i].maxdata = 0; diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index eddac00..3773202 100644 @@ -1111,7 +1112,7 @@ index 911c0e4..9706f5f 100644 @@ -750,7 +750,7 @@ do_deluser (struct net_device * ndev, int lockit) ch = c4_find_chan (channum); - if (ch = NULL) + if (ch == NULL) return -ENOENT; - ch->user = 0; /* will be freed, below */ + ch->user = NULL; /* will be freed, below */ @@ -1182,7 +1183,7 @@ index 8a7b3a6..681a75a 100644 - md->mem_token = 0; + md->mem_token = NULL; md->data = 0; - if (i = (txnum - 1)) + if (i == (txnum - 1)) { @@ -1455,10 +1455,10 @@ errfree: OS_mem_token_free (ch->mdr[i].mem_token); @@ -1433,13 +1434,13 @@ index df8661d..a956a4b 100644 @@ -905,12 +905,12 @@ static int s3c_hsudc_queue(struct usb_ep *_ep, struct usb_request *_req, csr = readl((u32)hsudc->regs + offset); if (!(csr & S3C_ESR_TX_SUCCESS) && - (s3c_hsudc_write_fifo(hsep, hsreq) = 1)) + (s3c_hsudc_write_fifo(hsep, hsreq) == 1)) - hsreq = 0; + hsreq = NULL; } else { csr = readl((u32)hsudc->regs + offset); if ((csr & S3C_ESR_RX_SUCCESS) - && (s3c_hsudc_read_fifo(hsep, hsreq) = 1)) + && (s3c_hsudc_read_fifo(hsep, hsreq) == 1)) - hsreq = 0; + hsreq = NULL; } @@ -1540,7 +1541,7 @@ index cb2ddf1..4c2444e 100644 + struct file *src_file = NULL, *dst_file = NULL; /* WORKAROUND FOR HARDWARE BUG IN BG TILE FETCH */ - if (unlikely(req->src_rect.h = 0 || + if (unlikely(req->src_rect.h == 0 || diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c index 8384b94..ecfd62e 100644 --- a/drivers/video/pxa168fb.c diff --git a/a/content_digest b/N1/content_digest index 07cdfc2..5f194ad 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01327559803.28707.6.camel@joe2Laptop\0" "From\0Joe Perches <joe@perches.com>\0" "Subject\0[PATCH next V2] drivers: Use NULL not zero pointer assignments\0" - "Date\0Fri, 27 Jan 2012 05:33:11 +0000\0" + "Date\0Thu, 26 Jan 2012 21:33:11 -0800\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Jiri Kosina <trivial@kernel.org>" kernel-janitors@vger.kernel.org @@ -162,7 +162,7 @@ " \t\t\tr = 0;\n" "@@ -341,7 +341,7 @@ static int smd_pkt_release(struct inode *inode, struct file *file)\n" " \tmutex_lock(&smd_pkt_devp->ch_lock);\n" - " \tif (--smd_pkt_devp->open_count = 0) {\n" + " \tif (--smd_pkt_devp->open_count == 0) {\n" " \t\tr = smd_close(smd_pkt_devp->ch);\n" "-\t\tsmd_pkt_devp->ch = 0;\n" "+\t\tsmd_pkt_devp->ch = NULL;\n" @@ -453,7 +453,7 @@ " \t\treturn -ENOMEM;\n" " \t}\n" "@@ -54,7 +54,7 @@ int s5p_mfc_alloc_dec_temp_buffers(struct s5p_mfc_ctx *ctx)\n" - " \tif (desc_virt = NULL) {\n" + " \tif (desc_virt == NULL) {\n" " \t\tvb2_dma_contig_memops.put(ctx->desc_buf);\n" " \t\tctx->desc_phys = 0;\n" "-\t\tctx->desc_buf = 0;\n" @@ -723,7 +723,7 @@ "--- a/drivers/net/ethernet/pasemi/pasemi_mac.c\n" "+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c\n" "@@ -393,7 +393,7 @@ static void pasemi_mac_setup_csrings(struct pasemi_mac *mac)\n" - " \tif (mac->type = MAC_TYPE_XAUI)\n" + " \tif (mac->type == MAC_TYPE_XAUI)\n" " \t\tmac->cs[1] = pasemi_mac_setup_csring(mac);\n" " \telse\n" "-\t\tmac->cs[1] = 0;\n" @@ -807,7 +807,7 @@ " \t}\n" " #endif\n" " \tinstance = scsi_register(host, sizeof(struct NCR5380_hostdata));\n" - " \tif (instance = NULL) {\n" + " \tif (instance == NULL) {\n" " \t\tatari_stram_free(atari_dma_buffer);\n" "-\t\tatari_dma_buffer = 0;\n" "+\t\tatari_dma_buffer = NULL;\n" @@ -1004,7 +1004,8 @@ " \t\t\t/* Channel specific range and maxdata */\n" "-\t\t\tdev->subdevices[i].range_table = 0;\n" "+\t\t\tdev->subdevices[i].range_table = NULL;\n" - " \t\t\tdev->subdevices[i].range_table_list \t\t\t p->range_table_list;\n" + " \t\t\tdev->subdevices[i].range_table_list =\n" + " \t\t\t p->range_table_list;\n" " \t\t\tdev->subdevices[i].maxdata = 0;\n" "diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c\n" "index eddac00..3773202 100644\n" @@ -1122,7 +1123,7 @@ " \n" "@@ -750,7 +750,7 @@ do_deluser (struct net_device * ndev, int lockit)\n" " ch = c4_find_chan (channum);\n" - " if (ch = NULL)\n" + " if (ch == NULL)\n" " return -ENOENT;\n" "- ch->user = 0; /* will be freed, below */\n" "+ ch->user = NULL; /* will be freed, below */\n" @@ -1193,7 +1194,7 @@ "- md->mem_token = 0;\n" "+ md->mem_token = NULL;\n" " md->data = 0;\n" - " if (i = (txnum - 1))\n" + " if (i == (txnum - 1))\n" " {\n" "@@ -1455,10 +1455,10 @@ errfree:\n" " OS_mem_token_free (ch->mdr[i].mem_token);\n" @@ -1444,13 +1445,13 @@ "@@ -905,12 +905,12 @@ static int s3c_hsudc_queue(struct usb_ep *_ep, struct usb_request *_req,\n" " \t\t\tcsr = readl((u32)hsudc->regs + offset);\n" " \t\t\tif (!(csr & S3C_ESR_TX_SUCCESS) &&\n" - " \t\t\t\t(s3c_hsudc_write_fifo(hsep, hsreq) = 1))\n" + " \t\t\t\t(s3c_hsudc_write_fifo(hsep, hsreq) == 1))\n" "-\t\t\t\thsreq = 0;\n" "+\t\t\t\thsreq = NULL;\n" " \t\t} else {\n" " \t\t\tcsr = readl((u32)hsudc->regs + offset);\n" " \t\t\tif ((csr & S3C_ESR_RX_SUCCESS)\n" - " \t\t\t\t && (s3c_hsudc_read_fifo(hsep, hsreq) = 1))\n" + " \t\t\t\t && (s3c_hsudc_read_fifo(hsep, hsreq) == 1))\n" "-\t\t\t\thsreq = 0;\n" "+\t\t\t\thsreq = NULL;\n" " \t\t}\n" @@ -1551,7 +1552,7 @@ "+\tstruct file *src_file = NULL, *dst_file = NULL;\n" " \n" " \t/* WORKAROUND FOR HARDWARE BUG IN BG TILE FETCH */\n" - " \tif (unlikely(req->src_rect.h = 0 ||\n" + " \tif (unlikely(req->src_rect.h == 0 ||\n" "diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c\n" "index 8384b94..ecfd62e 100644\n" "--- a/drivers/video/pxa168fb.c\n" @@ -1628,4 +1629,4 @@ " \tint retval = -ENOMEM;\n" " \tint i;" -6a265f61e41b2e9fc2cfc71d2de1dd5a3da5a85a12b5a23a140b783ea806b6da +38008cd8b170b6179f1efe58fcc7227140df3194c5d2062c215ef96257fa12ac
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.