From: Rohit Chavan Date: Wed, 16 Oct 2024 10:34:06 +0000 (+0530) Subject: staging: gpib: Replace kmalloc/memset with kzalloc. X-Git-Tag: v6.13-rc1~30^2~99 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c47adc2dfc2da2b028d60c990ea2fa656bc56c49;p=thirdparty%2Fkernel%2Flinux.git staging: gpib: Replace kmalloc/memset with kzalloc. This patch replaces kmalloc + memset with kzalloc in the GPIB driver. Signed-off-by: Rohit Chavan Reviewed-by: Dave Penkler Link: https://lore.kernel.org/r/20241016103406.1618448-1-roheetchavan@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c index 1296db4d47c63..cff555447ee97 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c @@ -518,10 +518,9 @@ void agilent_82350b_return_to_local(gpib_board_t *board) int agilent_82350b_allocate_private(gpib_board_t *board) { - board->private_data = kmalloc(sizeof(struct agilent_82350b_priv), GFP_KERNEL); + board->private_data = kzalloc(sizeof(struct agilent_82350b_priv), GFP_KERNEL); if (!board->private_data) return -ENOMEM; - memset(board->private_data, 0, sizeof(struct agilent_82350b_priv)); return 0; } diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb7210/cb7210.c index 59f6dde3d9661..d32576c219885 100644 --- a/drivers/staging/gpib/cb7210/cb7210.c +++ b/drivers/staging/gpib/cb7210/cb7210.c @@ -1199,10 +1199,9 @@ static int cb_gpib_probe(struct pcmcia_device *link) DEBUG(0, "%s(0x%p)\n", __func__, link); /* Allocate space for private device-specific data */ - info = kmalloc(sizeof(*info), GFP_KERNEL); + info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; - memset(info, 0, sizeof(*info)); info->p_dev = link; link->priv = info; diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c index 81a952beee0dc..847e4bea2cb17 100644 --- a/drivers/staging/gpib/gpio/gpib_bitbang.c +++ b/drivers/staging/gpib/gpio/gpib_bitbang.c @@ -1105,10 +1105,9 @@ static int bb_line_status(const gpib_board_t *board) static int allocate_private(gpib_board_t *board) { - board->private_data = kmalloc(sizeof(struct bb_priv), GFP_KERNEL); + board->private_data = kzalloc(sizeof(struct bb_priv), GFP_KERNEL); if (!board->private_data) return -1; - memset(board->private_data, 0, sizeof(struct bb_priv)); return 0; } diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/staging/gpib/hp_82335/hp82335.c index 4e277997684bd..cf92fc0b33377 100644 --- a/drivers/staging/gpib/hp_82335/hp82335.c +++ b/drivers/staging/gpib/hp_82335/hp82335.c @@ -201,10 +201,9 @@ return_to_local : hp82335_return_to_local, int hp82335_allocate_private(gpib_board_t *board) { - board->private_data = kmalloc(sizeof(struct hp82335_priv), GFP_KERNEL); + board->private_data = kzalloc(sizeof(struct hp82335_priv), GFP_KERNEL); if (!board->private_data) return -1; - memset(board->private_data, 0, sizeof(struct hp82335_priv)); return 0; } diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpib/hp_82341/hp_82341.c index d37dd8335523c..8ad1c885a9fb6 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.c +++ b/drivers/staging/gpib/hp_82341/hp_82341.c @@ -459,10 +459,9 @@ return_to_local : hp_82341_return_to_local, int hp_82341_allocate_private(gpib_board_t *board) { - board->private_data = kmalloc(sizeof(struct hp_82341_priv), GFP_KERNEL); + board->private_data = kzalloc(sizeof(struct hp_82341_priv), GFP_KERNEL); if (!board->private_data) return -ENOMEM; - memset(board->private_data, 0, sizeof(struct hp_82341_priv)); return 0; } diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/ines/ines_gpib.c index 9dbbdb048b9fb..87f9d3789c5ff 100644 --- a/drivers/staging/gpib/ines/ines_gpib.c +++ b/drivers/staging/gpib/ines/ines_gpib.c @@ -1063,10 +1063,9 @@ static int ines_gpib_probe(struct pcmcia_device *link) DEBUG(0, "%s(0x%p)\n", __func__ link); /* Allocate space for private device-specific data */ - info = kmalloc(sizeof(*info), GFP_KERNEL); + info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; - memset(info, 0, sizeof(*info)); info->p_dev = link; link->priv = info; diff --git a/drivers/staging/gpib/tnt4882/mite.c b/drivers/staging/gpib/tnt4882/mite.c index 882cc4bc122e7..0edf34d243e9e 100644 --- a/drivers/staging/gpib/tnt4882/mite.c +++ b/drivers/staging/gpib/tnt4882/mite.c @@ -57,12 +57,10 @@ void mite_init(void) for (pcidev = pci_get_device(PCI_VENDOR_ID_NATINST, PCI_ANY_ID, NULL); pcidev; pcidev = pci_get_device(PCI_VENDOR_ID_NATINST, PCI_ANY_ID, pcidev)) { - mite = kmalloc(sizeof(*mite), GFP_KERNEL); + mite = kzalloc(sizeof(*mite), GFP_KERNEL); if (!mite) return; - memset(mite, 0, sizeof(*mite)); - mite->pcidev = pcidev; pci_dev_get(mite->pcidev); mite->next = mite_devices; diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c index ef4b9ce36741e..0a850926c118c 100644 --- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c +++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c @@ -1644,10 +1644,9 @@ static int ni_gpib_probe(struct pcmcia_device *link) DEBUG(0, "%s(0x%p)\n", __func__, link); /* Allocate space for private device-specific data */ - info = kmalloc(sizeof(*info), GFP_KERNEL); + info = kzalloc(sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; - memset(info, 0, sizeof(*info)); info->p_dev = link; link->priv = info;