Message ID | 20161128132819.GA500@gnr743-HP-ZBook-15 (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Hello. On 11/28/2016 04:28 PM, Souptick Joarder wrote: > In mlx4_alloc_cmd_mailbox(), pci_pool_alloc() followed by memset will be > replaced by pci_pool_zalloc() > > Signed-off-by: Souptick joarder <jrdr.linux@gmail.com> > --- > drivers/net/ethernet/mellanox/mlx4/cmd.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c > index e36bebc..ee3bd76 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c > +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c > @@ -2679,14 +2679,13 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev) > if (!mailbox) > return ERR_PTR(-ENOMEM); > > - mailbox->buf = pci_pool_alloc(mlx4_priv(dev)->cmd.pool, GFP_KERNEL, > + mailbox->buf = pci_pool_zalloc(mlx4_priv(dev)->cmd.pool, GFP_KERNEL, > &mailbox->dma); You need to realign he continuation line now, the way it was aligned in the original code. [...] MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 29, 2016 at 12:36 AM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > Hello. > > On 11/28/2016 04:28 PM, Souptick Joarder wrote: > >> In mlx4_alloc_cmd_mailbox(), pci_pool_alloc() followed by memset will be >> replaced by pci_pool_zalloc() >> >> Signed-off-by: Souptick joarder <jrdr.linux@gmail.com> >> --- >> drivers/net/ethernet/mellanox/mlx4/cmd.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c >> b/drivers/net/ethernet/mellanox/mlx4/cmd.c >> index e36bebc..ee3bd76 100644 >> --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c >> +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c >> @@ -2679,14 +2679,13 @@ struct mlx4_cmd_mailbox >> *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev) >> if (!mailbox) >> return ERR_PTR(-ENOMEM); >> >> - mailbox->buf = pci_pool_alloc(mlx4_priv(dev)->cmd.pool, >> GFP_KERNEL, >> + mailbox->buf = pci_pool_zalloc(mlx4_priv(dev)->cmd.pool, >> GFP_KERNEL, >> &mailbox->dma); > > > You need to realign he continuation line now, the way it was aligned in > the original code. > Ok, I will do that. > > MBR, Sergei > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c index e36bebc..ee3bd76 100644 --- a/drivers/net/ethernet/mellanox/mlx4/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c @@ -2679,14 +2679,13 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev) if (!mailbox) return ERR_PTR(-ENOMEM); - mailbox->buf = pci_pool_alloc(mlx4_priv(dev)->cmd.pool, GFP_KERNEL, + mailbox->buf = pci_pool_zalloc(mlx4_priv(dev)->cmd.pool, GFP_KERNEL, &mailbox->dma); if (!mailbox->buf) { kfree(mailbox); return ERR_PTR(-ENOMEM); } - memset(mailbox->buf, 0, MLX4_MAILBOX_SIZE); return mailbox; }
In mlx4_alloc_cmd_mailbox(), pci_pool_alloc() followed by memset will be replaced by pci_pool_zalloc() Signed-off-by: Souptick joarder <jrdr.linux@gmail.com> --- drivers/net/ethernet/mellanox/mlx4/cmd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)