s390/idal: use struct_size() in kmalloc()
authorxiaolinkui <xiaolinkui@kylinos.cn>
Fri, 17 May 2019 07:15:17 +0000 (15:15 +0800)
committerHeiko Carstens <heiko.carstens@de.ibm.com>
Tue, 4 Jun 2019 13:03:18 +0000 (15:03 +0200)
Use the new struct_size() helper to keep code simple.

Signed-off-by: xiaolinkui <xiaolinkui@kylinos.cn>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
arch/s390/include/asm/idals.h

index 15578fd762f647123257b5e9b3f45eca7bb3d2cc..6fb7aced104ac295162cd1c9ad7dd1f53db63648 100644 (file)
@@ -122,8 +122,7 @@ idal_buffer_alloc(size_t size, int page_order)
 
        nr_ptrs = (size + IDA_BLOCK_SIZE - 1) >> IDA_SIZE_LOG;
        nr_chunks = (4096 << page_order) >> IDA_SIZE_LOG;
-       ib = kmalloc(sizeof(struct idal_buffer) + nr_ptrs*sizeof(void *),
-                    GFP_DMA | GFP_KERNEL);
+       ib = kmalloc(struct_size(ib, data, nr_ptrs), GFP_DMA | GFP_KERNEL);
        if (ib == NULL)
                return ERR_PTR(-ENOMEM);
        ib->size = size;