Messages in this thread | | | Subject | Re: [PATCH 08/22] amd: Use pci_zalloc_consistent | From | Don Fry <> | Date | Mon, 23 Jun 2014 11:02:04 -0700 |
| |
On Mon, 2014-06-23 at 06:41 -0700, Joe Perches wrote: > Remove the now unnecessary memset too. > > Signed-off-by: Joe Perches <joe@perches.com> > --- > drivers/net/ethernet/amd/pcnet32.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c > index e7cc917..e5e2725 100644 > --- a/drivers/net/ethernet/amd/pcnet32.c > +++ b/drivers/net/ethernet/amd/pcnet32.c > @@ -484,15 +484,13 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev, > > pcnet32_purge_tx_ring(dev); > > - new_tx_ring = pci_alloc_consistent(lp->pci_dev, > - sizeof(struct pcnet32_tx_head) * > - (1 << size), > - &new_ring_dma_addr); > + new_tx_ring = pci_zalloc_consistent(lp->pci_dev, > + sizeof(struct pcnet32_tx_head) * (1 << size),
This causes the line length to be greater than 80 characters causing checkpatch to complain.
> + &new_ring_dma_addr); > if (new_tx_ring == NULL) { > netif_err(lp, drv, dev, "Consistent memory allocation failed\n"); > return; > } > - memset(new_tx_ring, 0, sizeof(struct pcnet32_tx_head) * (1 << size)); > > new_dma_addr_list = kcalloc(1 << size, sizeof(dma_addr_t), > GFP_ATOMIC); > @@ -551,15 +549,13 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev, > int new, overlap; > unsigned int entries = 1 << size; > > - new_rx_ring = pci_alloc_consistent(lp->pci_dev, > - sizeof(struct pcnet32_rx_head) * > - entries, > - &new_ring_dma_addr); > + new_rx_ring = pci_zalloc_consistent(lp->pci_dev, > + sizeof(struct pcnet32_rx_head) * entries,
This causes the line length to be greater than 80 characters causing checkpatch to complain.
> + &new_ring_dma_addr); > if (new_rx_ring == NULL) { > netif_err(lp, drv, dev, "Consistent memory allocation failed\n"); > return; > } > - memset(new_rx_ring, 0, sizeof(struct pcnet32_rx_head) * entries); > > new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC); > if (!new_dma_addr_list)
| |