kmalloc/kzalloc changes:

dv1394, eth1394, ieee1394, ohci1394, pcilynx, raw1394, sbp2c, video1394:
 - use kzalloc
 - provide safer size arguments to kmalloc and kzalloc
 - omit some casts

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index 61ddd5d37eff..c0f8ed6fca8a 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -1261,7 +1261,7 @@ static int csr1212_parse_bus_info_block(struct csr1212_csr *csr)
                 return CSR1212_EINVAL;
 #endif
 
-        cr = CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+        cr = CSR1212_MALLOC(sizeof(*cr));
         if (!cr)
                 return CSR1212_ENOMEM;
 
@@ -1393,8 +1393,7 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
         case CSR1212_KV_TYPE_LEAF:
                 if (kv->key.id != CSR1212_KV_ID_EXTENDED_ROM) {
                         kv->value.leaf.data = CSR1212_MALLOC(quads_to_bytes(kvi_len));
-                        if (!kv->value.leaf.data)
-                        {
+                        if (!kv->value.leaf.data) {
                                 ret = CSR1212_ENOMEM;
                                 goto fail;
                         }
@@ -1462,7 +1461,7 @@ int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
                 cache->next = NULL;
                 csr->cache_tail = cache;
                 cache->filled_head =
-                        CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+                        CSR1212_MALLOC(sizeof(*cache->filled_head));
                 if (!cache->filled_head) {
                         return CSR1212_ENOMEM;
                 }
@@ -1484,7 +1483,7 @@ int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
         /* Now seach read portions of the cache to see if it is there. */
         for (cr = cache->filled_head; cr; cr = cr->next) {
                 if (cache_index < cr->offset_start) {
-                        newcr = CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+                        newcr = CSR1212_MALLOC(sizeof(*newcr));
                         if (!newcr)
                                 return CSR1212_ENOMEM;
 
@@ -1508,7 +1507,7 @@ int _csr1212_read_keyval(struct csr1212_csr *csr, struct csr1212_keyval *kv)
 
         if (!cr) {
                 cr = cache->filled_tail;
-                newcr = CSR1212_MALLOC(sizeof(struct csr1212_cache_region));
+                newcr = CSR1212_MALLOC(sizeof(*newcr));
                 if (!newcr)
                         return CSR1212_ENOMEM;