Merge tag 'for-5.4/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/devic...

[linux.git] / drivers / leds / leds-is31fl32xx.c

diff --git a/drivers/leds/leds-is31fl32xx.c b/drivers/leds/leds-is31fl32xx.c
index 6fbab70dfb04d25c8ed2ea317cceb3dc92f34a42..6f29b8943913bbfc20ff1d3180c576563dfac8b2 100644 (file)
--- a/drivers/leds/leds-is31fl32xx.c
+++ b/drivers/leds/leds-is31fl32xx.c
@@ -324,12 +324,6 @@ static int is31fl32xx_init_regs(struct is31fl32xx_priv *priv)
        return 0;
 }
 
-static inline size_t sizeof_is31fl32xx_priv(int num_leds)
-{
-       return sizeof(struct is31fl32xx_priv) +
-                     (sizeof(struct is31fl32xx_led_data) * num_leds);
-}
-
 static int is31fl32xx_parse_child_dt(const struct device *dev,
                                     const struct device_node *child,
                                     struct is31fl32xx_led_data *led_data)
@@ -450,7 +444,7 @@ static int is31fl32xx_probe(struct i2c_client *client,
        if (!count)
                return -EINVAL;
 
-       priv = devm_kzalloc(dev, sizeof_is31fl32xx_priv(count),
+       priv = devm_kzalloc(dev, struct_size(priv, leds, count),
                            GFP_KERNEL);
        if (!priv)
                return -ENOMEM;