[PATCH] gpio: virtio: remove one kcalloc

[Rosen Penev]

A flexible array member can be used to combine allocations.

Signed-off-by: Rosen Penev <ros...@gmail.com>
---
 drivers/gpio/gpio-virtio.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/gpio/gpio-virtio.c b/drivers/gpio/gpio-virtio.c
index ed6e0e90fa8a..876a34ed739d 100644
--- a/drivers/gpio/gpio-virtio.c
+++ b/drivers/gpio/gpio-virtio.c
@@ -52,7 +52,6 @@ struct virtio_gpio {
        struct virtio_device *vdev;
        struct mutex lock; /* Protects virtqueue operation */
        struct gpio_chip gc;
-       struct virtio_gpio_line *lines;
        struct virtqueue *request_vq;
 
        /* irq support */
@@ -60,6 +59,7 @@ struct virtio_gpio {
        struct mutex irq_lock; /* Protects irq operation */
        raw_spinlock_t eventq_lock; /* Protects queuing of the buffer */
        struct vgpio_irq_line *irq_lines;
+       struct virtio_gpio_line lines[];
 };
 
 static int _virtio_gpio_req(struct virtio_gpio *vgpio, u16 type, u16 gpio,
@@ -541,10 +541,6 @@ static int virtio_gpio_probe(struct virtio_device *vdev)
        u16 ngpio;
        int ret, i;
 
-       vgpio = devm_kzalloc(dev, sizeof(*vgpio), GFP_KERNEL);
-       if (!vgpio)
-               return -ENOMEM;
-
        /* Read configuration */
        gpio_names_size =
                virtio_cread32(vdev, offsetof(struct virtio_gpio_config,
@@ -556,8 +552,8 @@ static int virtio_gpio_probe(struct virtio_device *vdev)
                return -EINVAL;
        }
 
-       vgpio->lines = devm_kcalloc(dev, ngpio, sizeof(*vgpio->lines), 
GFP_KERNEL);
-       if (!vgpio->lines)
+       vgpio = devm_kzalloc(dev, struct_size(vgpio, lines, ngpio), GFP_KERNEL);
+       if (!vgpio)
                return -ENOMEM;
 
        for (i = 0; i < ngpio; i++) {
-- 
2.53.0