diff for duplicates of <49DDC98A.4090509@fastmail.fm> diff --git a/a/1.txt b/N1/1.txt index 6fc51a1..20006a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,7 +46,7 @@ Jack Stone wrote: > sizeof(struct recv_desc_bufs), (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL); > + lp->dlist = dma_alloc_coherent(NULL, sizeof(struct recv_desc_bufs), > (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL); -> if (lp->dlist = NULL) { +> if (lp->dlist == NULL) { > free_irq(dev->irq, dev); > free_netdev(dev); > diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c @@ -70,7 +70,7 @@ Jack Stone wrote: > --- a/drivers/net/gianfar.c > +++ b/drivers/net/gianfar.c > @@ -268,7 +268,7 @@ static int gfar_of_init(struct net_device *dev) -> if (ph = NULL) { +> if (ph == NULL) { > u32 *fixed_link; > > - fixed_link = (u32 *)of_get_property(np, "fixed-link", NULL); @@ -111,7 +111,8 @@ Jack Stone wrote: > goto out2; > > /* allocate the data buffers */ -> - aup->db[0].vaddr > - (void *)dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &temp); +> - aup->db[0].vaddr = +> - (void *)dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &temp); > + aup->db[0].vaddr = dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &temp); > if (!aup->db[0].vaddr) > goto out3; @@ -126,9 +127,10 @@ Jack Stone wrote: > struct netxen_cmd_buffer *cmd_buf_arr; > struct net_device *netdev = adapter->netdev; > -> - cmd_buf_arr > - (struct netxen_cmd_buffer *)vmalloc(TX_BUFF_RINGSIZE(adapter)); +> - cmd_buf_arr = +> - (struct netxen_cmd_buffer *)vmalloc(TX_BUFF_RINGSIZE(adapter)); > + cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(adapter)); -> if (cmd_buf_arr = NULL) { +> if (cmd_buf_arr == NULL) { > printk(KERN_ERR "%s: Failed to allocate cmd buffer ring\n", > netdev->name); > @@ -277,8 +276,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter @@ -139,7 +141,7 @@ Jack Stone wrote: > - rds_ring->rx_buf_arr = (struct netxen_rx_buffer *) > - vmalloc(RCV_BUFF_RINGSIZE(rds_ring)); > + rds_ring->rx_buf_arr = vmalloc(RCV_BUFF_RINGSIZE(rds_ring)); -> if (rds_ring->rx_buf_arr = NULL) { +> if (rds_ring->rx_buf_arr == NULL) { > printk(KERN_ERR "%s: Failed to allocate " > "rx buffer ring %d\n", > diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c @@ -183,10 +185,12 @@ Jack Stone wrote: > DB_ESS("ESS: save Alloc Req Trans ID %lx\n",sm->smt_tid,0); > - p = (void *) sm_to_para(smc,sm,SMT_P320F) ; > + p = sm_to_para(smc,sm,SMT_P320F) ; -> ((struct smt_p_320f *)p)->mib_payload > smc->mib.a[PATH0].fddiPATHSbaPayload ; +> ((struct smt_p_320f *)p)->mib_payload = +> smc->mib.a[PATH0].fddiPATHSbaPayload ; > - p = (void *) sm_to_para(smc,sm,SMT_P3210) ; > + p = sm_to_para(smc,sm,SMT_P3210) ; -> ((struct smt_p_3210 *)p)->mib_overhead > smc->mib.a[PATH0].fddiPATHSbaOverhead ; +> ((struct smt_p_3210 *)p)->mib_overhead = +> smc->mib.a[PATH0].fddiPATHSbaOverhead ; > sm->smt_dest = smt_sba_da ; > @@ -248,13 +248,13 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf > *mb, struct smt_header *sm, @@ -296,7 +300,8 @@ Jack Stone wrote: > - sm_to_para(smc,sm,SMT_P_STATE) ; > + st = sm_to_para(smc,sm,SMT_P_STATE) ; > if (st) { -> smc->mib.m[MAC0].fddiMACUNDA_Flag > (st->st_dupl_addr & SMT_ST_MY_DUPA) ? +> smc->mib.m[MAC0].fddiMACUNDA_Flag = +> (st->st_dupl_addr & SMT_ST_MY_DUPA) ? > diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c > index d2dfe0a..4de10ce 100644 > --- a/drivers/net/sungem.c @@ -357,7 +362,8 @@ Jack Stone wrote: > IPW_DEBUG_INFO("enter\n"); > > q->size = entries * sizeof(struct ipw2100_status); -> - q->drv > - (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev, +> - q->drv = +> - (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev, > - q->size, &q->nic); > + q->drv = pci_alloc_consistent(priv->pci_dev, q->size, &q->nic); > if (!q->drv) { diff --git a/a/content_digest b/N1/content_digest index 5599fd8..a4e57f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,7 +12,7 @@ "ref\049DCAF42.1060709@fastmail.fm\0" "From\0Jack Stone <jwjstone@fastmail.fm>\0" "Subject\0Re: [PATCH 30/56] net: Remove void casts\0" - "Date\0Thu, 09 Apr 2009 10:10:18 +0000\0" + "Date\0Thu, 09 Apr 2009 11:10:18 +0100\0" "To\0Bert Wesarg <bert.wesarg@googlemail.com>\0" "Cc\0linux-kernel@vger.kernel.org" jeff@garzik.org @@ -68,7 +68,7 @@ "> sizeof(struct recv_desc_bufs), (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL);\n" "> + lp->dlist = dma_alloc_coherent(NULL, sizeof(struct recv_desc_bufs),\n" "> (dma_addr_t *) &lp->dlist_phys, GFP_KERNEL);\n" - "> if (lp->dlist = NULL) {\n" + "> if (lp->dlist == NULL) {\n" "> free_irq(dev->irq, dev);\n" "> free_netdev(dev);\n" "> diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c\n" @@ -92,7 +92,7 @@ "> --- a/drivers/net/gianfar.c\n" "> +++ b/drivers/net/gianfar.c\n" "> @@ -268,7 +268,7 @@ static int gfar_of_init(struct net_device *dev)\n" - "> if (ph = NULL) {\n" + "> if (ph == NULL) {\n" "> u32 *fixed_link;\n" "> \n" "> - fixed_link = (u32 *)of_get_property(np, \"fixed-link\", NULL);\n" @@ -133,7 +133,8 @@ "> goto out2;\n" "> \n" "> /* allocate the data buffers */\n" - "> - aup->db[0].vaddr > - (void *)dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &temp);\n" + "> - aup->db[0].vaddr =\n" + "> - (void *)dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &temp);\n" "> + aup->db[0].vaddr = dma_alloc(MAX_BUF_SIZE * 2*NUM_IR_DESC, &temp);\n" "> if (!aup->db[0].vaddr)\n" "> goto out3;\n" @@ -148,9 +149,10 @@ "> struct netxen_cmd_buffer *cmd_buf_arr;\n" "> struct net_device *netdev = adapter->netdev;\n" "> \n" - "> - cmd_buf_arr > - (struct netxen_cmd_buffer *)vmalloc(TX_BUFF_RINGSIZE(adapter));\n" + "> - cmd_buf_arr =\n" + "> - (struct netxen_cmd_buffer *)vmalloc(TX_BUFF_RINGSIZE(adapter));\n" "> + cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(adapter));\n" - "> if (cmd_buf_arr = NULL) {\n" + "> if (cmd_buf_arr == NULL) {\n" "> printk(KERN_ERR \"%s: Failed to allocate cmd buffer ring\\n\",\n" "> netdev->name);\n" "> @@ -277,8 +276,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter\n" @@ -161,7 +163,7 @@ "> - rds_ring->rx_buf_arr = (struct netxen_rx_buffer *)\n" "> - vmalloc(RCV_BUFF_RINGSIZE(rds_ring));\n" "> + rds_ring->rx_buf_arr = vmalloc(RCV_BUFF_RINGSIZE(rds_ring));\n" - "> if (rds_ring->rx_buf_arr = NULL) {\n" + "> if (rds_ring->rx_buf_arr == NULL) {\n" "> printk(KERN_ERR \"%s: Failed to allocate \"\n" "> \"rx buffer ring %d\\n\",\n" "> diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c\n" @@ -205,10 +207,12 @@ "> DB_ESS(\"ESS: save Alloc Req Trans ID %lx\\n\",sm->smt_tid,0);\n" "> - p = (void *) sm_to_para(smc,sm,SMT_P320F) ;\n" "> + p = sm_to_para(smc,sm,SMT_P320F) ;\n" - "> ((struct smt_p_320f *)p)->mib_payload > smc->mib.a[PATH0].fddiPATHSbaPayload ;\n" + "> ((struct smt_p_320f *)p)->mib_payload =\n" + "> smc->mib.a[PATH0].fddiPATHSbaPayload ;\n" "> - p = (void *) sm_to_para(smc,sm,SMT_P3210) ;\n" "> + p = sm_to_para(smc,sm,SMT_P3210) ;\n" - "> ((struct smt_p_3210 *)p)->mib_overhead > smc->mib.a[PATH0].fddiPATHSbaOverhead ;\n" + "> ((struct smt_p_3210 *)p)->mib_overhead =\n" + "> smc->mib.a[PATH0].fddiPATHSbaOverhead ;\n" "> sm->smt_dest = smt_sba_da ;\n" "> @@ -248,13 +248,13 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf\n" "> *mb, struct smt_header *sm,\n" @@ -318,7 +322,8 @@ "> - sm_to_para(smc,sm,SMT_P_STATE) ;\n" "> + st = sm_to_para(smc,sm,SMT_P_STATE) ;\n" "> if (st) {\n" - "> smc->mib.m[MAC0].fddiMACUNDA_Flag > (st->st_dupl_addr & SMT_ST_MY_DUPA) ?\n" + "> smc->mib.m[MAC0].fddiMACUNDA_Flag =\n" + "> (st->st_dupl_addr & SMT_ST_MY_DUPA) ?\n" "> diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c\n" "> index d2dfe0a..4de10ce 100644\n" "> --- a/drivers/net/sungem.c\n" @@ -379,7 +384,8 @@ "> IPW_DEBUG_INFO(\"enter\\n\");\n" "> \n" "> q->size = entries * sizeof(struct ipw2100_status);\n" - "> - q->drv > - (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev,\n" + "> - q->drv =\n" + "> - (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev,\n" "> - q->size, &q->nic);\n" "> + q->drv = pci_alloc_consistent(priv->pci_dev, q->size, &q->nic);\n" "> if (!q->drv) {\n" @@ -391,4 +397,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -a194562af66b13e110ec053065e1de3327cae3bcfa17860f4b0aa799bd8a77e0 +2974dbd76745609dc512e991451320724ddd50fb7c0dd82d402f66f9efaae0fa
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.