Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1720231
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 10/14] vme: ca91cx42: Improve 12 size determinations |
| Date | 2017-08-25 18:10 +0200 |
| Message-ID | <uiplh-6dJ-49@gated-at.bofh.it> (permalink) |
| References | <uip1T-5RV-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 25 Aug 2017 10:56:41 +0200
Replace the specification of data structures by variable references
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/vme/bridges/vme_ca91cx42.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index d25f997e8aeb..61990c7f4543 100644
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -529,7 +529,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
image->kern_base = NULL;
kfree(image->bus_resource.name);
release_resource(&image->bus_resource);
- memset(&image->bus_resource, 0, sizeof(struct resource));
+ memset(&image->bus_resource, 0, sizeof(image->bus_resource));
}
if (image->bus_resource.name == NULL) {
@@ -572,7 +572,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
release_resource(&image->bus_resource);
err_resource:
kfree(image->bus_resource.name);
- memset(&image->bus_resource, 0, sizeof(struct resource));
+ memset(&image->bus_resource, 0, sizeof(image->bus_resource));
err_name:
return retval;
}
@@ -586,7 +586,7 @@ static void ca91cx42_free_resource(struct vme_master_resource *image)
image->kern_base = NULL;
release_resource(&image->bus_resource);
kfree(image->bus_resource.name);
- memset(&image->bus_resource, 0, sizeof(struct resource));
+ memset(&image->bus_resource, 0, sizeof(image->bus_resource));
}
@@ -1034,5 +1034,5 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
dev = list->parent->parent->parent;
/* XXX descriptor must be aligned on 64-bit boundaries */
- entry = kmalloc(sizeof(struct ca91cx42_dma_entry), GFP_KERNEL);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (entry == NULL) {
@@ -1048,7 +1048,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
goto err_align;
}
- memset(&entry->descriptor, 0, sizeof(struct ca91cx42_dma_descriptor));
+ memset(&entry->descriptor, 0, sizeof(entry->descriptor));
if (dest->type == VME_DMA_VME) {
entry->descriptor.dctl |= CA91CX42_DCTL_L2V;
@@ -1614,14 +1614,12 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* We want to support more than one of each bridge so we need to
* dynamically allocate the bridge structure
*/
- ca91cx42_bridge = kzalloc(sizeof(struct vme_bridge), GFP_KERNEL);
-
+ ca91cx42_bridge = kzalloc(sizeof(*ca91cx42_bridge), GFP_KERNEL);
if (ca91cx42_bridge == NULL) {
retval = -ENOMEM;
goto err_struct;
}
vme_init_bridge(ca91cx42_bridge);
- ca91cx42_device = kzalloc(sizeof(struct ca91cx42_driver), GFP_KERNEL);
-
+ ca91cx42_device = kzalloc(sizeof(*ca91cx42_device), GFP_KERNEL);
if (ca91cx42_device == NULL) {
@@ -1680,6 +1678,5 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add master windows to list */
for (i = 0; i < CA91C142_MAX_MASTER; i++) {
- master_image = kmalloc(sizeof(struct vme_master_resource),
- GFP_KERNEL);
+ master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
if (master_image == NULL) {
@@ -1696,7 +1693,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
VME_SUPER | VME_USER | VME_PROG | VME_DATA;
master_image->width_attr = VME_D8 | VME_D16 | VME_D32 | VME_D64;
memset(&master_image->bus_resource, 0,
- sizeof(struct resource));
+ sizeof(master_image->bus_resource));
master_image->kern_base = NULL;
list_add_tail(&master_image->list,
&ca91cx42_bridge->master_resources);
@@ -1704,6 +1701,5 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add slave windows to list */
for (i = 0; i < CA91C142_MAX_SLAVE; i++) {
- slave_image = kmalloc(sizeof(struct vme_slave_resource),
- GFP_KERNEL);
+ slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL);
if (slave_image == NULL) {
@@ -1729,6 +1725,5 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add dma engines to list */
for (i = 0; i < CA91C142_MAX_DMA; i++) {
- dma_ctrlr = kmalloc(sizeof(struct vme_dma_resource),
- GFP_KERNEL);
+ dma_ctrlr = kmalloc(sizeof(*dma_ctrlr), GFP_KERNEL);
if (dma_ctrlr == NULL) {
@@ -1748,5 +1743,5 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* Add location monitor to list */
- lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL);
+ lm = kmalloc(sizeof(*lm), GFP_KERNEL);
if (lm == NULL) {
--
2.14.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/14] VME: Adjustments for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 17:50 +0200
[PATCH 01/14] vme: Delete 11 error messages for a failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:00 +0200
[PATCH 02/14] vme: Improve 11 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:00 +0200
[PATCH 03/14] vme: Move an assignment in vme_new_dma_list() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:00 +0200
[PATCH 04/14] vme: Adjust 48 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:00 +0200
[PATCH 07/14] vme: fake: Improve five size determinations in fake_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:10 +0200
[PATCH 05/14] vme: Return directly in two functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:10 +0200
[PATCH 06/14] vme: fake: Delete an error message for a failed memory allocation in fake_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:10 +0200
[PATCH 08/14] vme: fake: Adjust 11 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:10 +0200
[PATCH 09/14] vme: ca91cx42: Delete eight error messages for a failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:10 +0200
[PATCH 10/14] vme: ca91cx42: Improve 12 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:10 +0200
[PATCH 13/14] vme: tsi148: Improve 17 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:20 +0200
Re: [PATCH 13/14] vme: tsi148: Improve 17 size determinations Martyn Welch <martyn@welchs.me.uk> - 2017-08-25 23:00 +0200
Re: [PATCH 13/14] vme: tsi148: Improve 17 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-26 09:10 +0200
Re: [PATCH 13/14] vme: tsi148: Improve 17 size determinations Martyn Welch <martyn@welchs.me.uk> - 2017-08-30 21:50 +0200
Re: [PATCH 13/14] vme: tsi148: Improve 17 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-30 23:00 +0200
[PATCH 11/14] vme: ca91cx42: Adjust 14 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:20 +0200
[PATCH 12/14] vme: tsi148: Delete nine error messages for a failed memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:20 +0200
[PATCH 14/14] vme: tsi148: Adjust 14 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-25 18:20 +0200
Re: [PATCH 00/14] VME: Adjustments for several function implementations Martyn Welch <martyn@welchs.me.uk> - 2017-08-26 00:00 +0200
Re: [PATCH 00/14] VME: Adjustments for several function implementations Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-08-26 09:10 +0200
csiph-web