Commit a7ad53cb authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Pavel Machek

leds: ns2: Use struct_size() in devm_kzalloc()

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes. Also, remove unnecessary
function sizeof_ns2_led_priv().

This code was detected with the help of Coccinelle and, audited and
fixed manually.
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
parent c4e94413
...@@ -348,12 +348,6 @@ struct ns2_led_priv { ...@@ -348,12 +348,6 @@ struct ns2_led_priv {
struct ns2_led_data leds_data[]; struct ns2_led_data leds_data[];
}; };
static inline int sizeof_ns2_led_priv(int num_leds)
{
return sizeof(struct ns2_led_priv) +
(sizeof(struct ns2_led_data) * num_leds);
}
static int ns2_led_probe(struct platform_device *pdev) static int ns2_led_probe(struct platform_device *pdev)
{ {
struct ns2_led_platform_data *pdata = dev_get_platdata(&pdev->dev); struct ns2_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
...@@ -378,8 +372,7 @@ static int ns2_led_probe(struct platform_device *pdev) ...@@ -378,8 +372,7 @@ static int ns2_led_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
#endif /* CONFIG_OF_GPIO */ #endif /* CONFIG_OF_GPIO */
priv = devm_kzalloc(&pdev->dev, priv = devm_kzalloc(&pdev->dev, struct_size(priv, leds_data, pdata->num_leds), GFP_KERNEL);
sizeof_ns2_led_priv(pdata->num_leds), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->num_leds = pdata->num_leds; priv->num_leds = pdata->num_leds;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment