mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	The devm_kzalloc() function has a 2-factor argument form, devm_kcalloc().
This patch replaces cases of:
        devm_kzalloc(handle, a * b, gfp)
with:
        devm_kcalloc(handle, a * b, gfp)
as well as handling cases of:
        devm_kzalloc(handle, a * b * c, gfp)
with:
        devm_kzalloc(handle, array3_size(a, b, c), gfp)
as it's slightly less ugly than:
        devm_kcalloc(handle, array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
        devm_kzalloc(handle, 4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
Some manual whitespace fixes were needed in this patch, as Coccinelle
really liked to write "=devm_kcalloc..." instead of "= devm_kcalloc...".
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
expression HANDLE;
type TYPE;
expression THING, E;
@@
(
  devm_kzalloc(HANDLE,
-	(sizeof(TYPE)) * E
+	sizeof(TYPE) * E
  , ...)
|
  devm_kzalloc(HANDLE,
-	(sizeof(THING)) * E
+	sizeof(THING) * E
  , ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression HANDLE;
expression COUNT;
typedef u8;
typedef __u8;
@@
(
  devm_kzalloc(HANDLE,
-	sizeof(u8) * (COUNT)
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(__u8) * (COUNT)
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(char) * (COUNT)
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(unsigned char) * (COUNT)
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(u8) * COUNT
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(__u8) * COUNT
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(char) * COUNT
+	COUNT
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(unsigned char) * COUNT
+	COUNT
  , ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
expression HANDLE;
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(TYPE) * (COUNT_ID)
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(TYPE) * COUNT_ID
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(TYPE) * (COUNT_CONST)
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(TYPE) * COUNT_CONST
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(THING) * (COUNT_ID)
+	COUNT_ID, sizeof(THING)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(THING) * COUNT_ID
+	COUNT_ID, sizeof(THING)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(THING) * (COUNT_CONST)
+	COUNT_CONST, sizeof(THING)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(THING) * COUNT_CONST
+	COUNT_CONST, sizeof(THING)
  , ...)
)
// 2-factor product, only identifiers.
@@
expression HANDLE;
identifier SIZE, COUNT;
@@
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	SIZE * COUNT
+	COUNT, SIZE
  , ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression HANDLE;
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
  devm_kzalloc(HANDLE,
-	sizeof(TYPE) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(TYPE) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(TYPE) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(TYPE) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(THING) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(THING) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(THING) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(THING) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression HANDLE;
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
  devm_kzalloc(HANDLE,
-	sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(THING1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(THING1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(TYPE1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
|
  devm_kzalloc(HANDLE,
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
expression HANDLE;
identifier STRIDE, SIZE, COUNT;
@@
(
  devm_kzalloc(HANDLE,
-	(COUNT) * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	COUNT * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	COUNT * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	(COUNT) * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	COUNT * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	(COUNT) * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	(COUNT) * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  devm_kzalloc(HANDLE,
-	COUNT * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression HANDLE;
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
  devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
  devm_kzalloc(HANDLE,
-	(E1) * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  devm_kzalloc(HANDLE,
-	(E1) * (E2) * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  devm_kzalloc(HANDLE,
-	(E1) * (E2) * (E3)
+	array3_size(E1, E2, E3)
  , ...)
|
  devm_kzalloc(HANDLE,
-	E1 * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression HANDLE;
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
  devm_kzalloc(HANDLE, sizeof(THING) * C2, ...)
|
  devm_kzalloc(HANDLE, sizeof(TYPE) * C2, ...)
|
  devm_kzalloc(HANDLE, C1 * C2 * C3, ...)
|
  devm_kzalloc(HANDLE, C1 * C2, ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(TYPE) * (E2)
+	E2, sizeof(TYPE)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(TYPE) * E2
+	E2, sizeof(TYPE)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(THING) * (E2)
+	E2, sizeof(THING)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	sizeof(THING) * E2
+	E2, sizeof(THING)
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	(E1) * E2
+	E1, E2
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	(E1) * (E2)
+	E1, E2
  , ...)
|
- devm_kzalloc
+ devm_kcalloc
  (HANDLE,
-	E1 * E2
+	E1, E2
  , ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
		
	
			
		
			
				
	
	
		
			198 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			198 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * LEDs driver for Analog Devices ADP5520/ADP5501 MFD PMICs
 | 
						|
 *
 | 
						|
 * Copyright 2009 Analog Devices Inc.
 | 
						|
 *
 | 
						|
 * Loosely derived from leds-da903x:
 | 
						|
 * Copyright (C) 2008 Compulab, Ltd.
 | 
						|
 *	Mike Rapoport <mike@compulab.co.il>
 | 
						|
 *
 | 
						|
 * Copyright (C) 2006-2008 Marvell International Ltd.
 | 
						|
 *	Eric Miao <eric.miao@marvell.com>
 | 
						|
 *
 | 
						|
 * Licensed under the GPL-2 or later.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <linux/leds.h>
 | 
						|
#include <linux/mfd/adp5520.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
 | 
						|
struct adp5520_led {
 | 
						|
	struct led_classdev	cdev;
 | 
						|
	struct device		*master;
 | 
						|
	int			id;
 | 
						|
	int			flags;
 | 
						|
};
 | 
						|
 | 
						|
static int adp5520_led_set(struct led_classdev *led_cdev,
 | 
						|
			   enum led_brightness value)
 | 
						|
{
 | 
						|
	struct adp5520_led *led;
 | 
						|
 | 
						|
	led = container_of(led_cdev, struct adp5520_led, cdev);
 | 
						|
	return adp5520_write(led->master, ADP5520_LED1_CURRENT + led->id - 1,
 | 
						|
			 value >> 2);
 | 
						|
}
 | 
						|
 | 
						|
static int adp5520_led_setup(struct adp5520_led *led)
 | 
						|
{
 | 
						|
	struct device *dev = led->master;
 | 
						|
	int flags = led->flags;
 | 
						|
	int ret = 0;
 | 
						|
 | 
						|
	switch (led->id) {
 | 
						|
	case FLAG_ID_ADP5520_LED1_ADP5501_LED0:
 | 
						|
		ret |= adp5520_set_bits(dev, ADP5520_LED_TIME,
 | 
						|
					(flags >> ADP5520_FLAG_OFFT_SHIFT) &
 | 
						|
					ADP5520_FLAG_OFFT_MASK);
 | 
						|
		ret |= adp5520_set_bits(dev, ADP5520_LED_CONTROL,
 | 
						|
					ADP5520_LED1_EN);
 | 
						|
		break;
 | 
						|
	case FLAG_ID_ADP5520_LED2_ADP5501_LED1:
 | 
						|
		ret |= adp5520_set_bits(dev,  ADP5520_LED_TIME,
 | 
						|
					((flags >> ADP5520_FLAG_OFFT_SHIFT) &
 | 
						|
					ADP5520_FLAG_OFFT_MASK) << 2);
 | 
						|
		ret |= adp5520_clr_bits(dev, ADP5520_LED_CONTROL,
 | 
						|
					 ADP5520_R3_MODE);
 | 
						|
		ret |= adp5520_set_bits(dev, ADP5520_LED_CONTROL,
 | 
						|
					ADP5520_LED2_EN);
 | 
						|
		break;
 | 
						|
	case FLAG_ID_ADP5520_LED3_ADP5501_LED2:
 | 
						|
		ret |= adp5520_set_bits(dev,  ADP5520_LED_TIME,
 | 
						|
					((flags >> ADP5520_FLAG_OFFT_SHIFT) &
 | 
						|
					ADP5520_FLAG_OFFT_MASK) << 4);
 | 
						|
		ret |= adp5520_clr_bits(dev, ADP5520_LED_CONTROL,
 | 
						|
					ADP5520_C3_MODE);
 | 
						|
		ret |= adp5520_set_bits(dev, ADP5520_LED_CONTROL,
 | 
						|
					ADP5520_LED3_EN);
 | 
						|
		break;
 | 
						|
	}
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
static int adp5520_led_prepare(struct platform_device *pdev)
 | 
						|
{
 | 
						|
	struct adp5520_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
 | 
						|
	struct device *dev = pdev->dev.parent;
 | 
						|
	int ret = 0;
 | 
						|
 | 
						|
	ret |= adp5520_write(dev, ADP5520_LED1_CURRENT, 0);
 | 
						|
	ret |= adp5520_write(dev, ADP5520_LED2_CURRENT, 0);
 | 
						|
	ret |= adp5520_write(dev, ADP5520_LED3_CURRENT, 0);
 | 
						|
	ret |= adp5520_write(dev, ADP5520_LED_TIME, pdata->led_on_time << 6);
 | 
						|
	ret |= adp5520_write(dev, ADP5520_LED_FADE, FADE_VAL(pdata->fade_in,
 | 
						|
		 pdata->fade_out));
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
static int adp5520_led_probe(struct platform_device *pdev)
 | 
						|
{
 | 
						|
	struct adp5520_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
 | 
						|
	struct adp5520_led *led, *led_dat;
 | 
						|
	struct led_info *cur_led;
 | 
						|
	int ret, i;
 | 
						|
 | 
						|
	if (pdata == NULL) {
 | 
						|
		dev_err(&pdev->dev, "missing platform data\n");
 | 
						|
		return -ENODEV;
 | 
						|
	}
 | 
						|
 | 
						|
	if (pdata->num_leds > ADP5520_01_MAXLEDS) {
 | 
						|
		dev_err(&pdev->dev, "can't handle more than %d LEDS\n",
 | 
						|
				 ADP5520_01_MAXLEDS);
 | 
						|
		return -EFAULT;
 | 
						|
	}
 | 
						|
 | 
						|
	led = devm_kcalloc(&pdev->dev, pdata->num_leds, sizeof(*led),
 | 
						|
				GFP_KERNEL);
 | 
						|
	if (!led)
 | 
						|
		return -ENOMEM;
 | 
						|
 | 
						|
	ret = adp5520_led_prepare(pdev);
 | 
						|
	if (ret) {
 | 
						|
		dev_err(&pdev->dev, "failed to write\n");
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	for (i = 0; i < pdata->num_leds; ++i) {
 | 
						|
		cur_led = &pdata->leds[i];
 | 
						|
		led_dat = &led[i];
 | 
						|
 | 
						|
		led_dat->cdev.name = cur_led->name;
 | 
						|
		led_dat->cdev.default_trigger = cur_led->default_trigger;
 | 
						|
		led_dat->cdev.brightness_set_blocking = adp5520_led_set;
 | 
						|
		led_dat->cdev.brightness = LED_OFF;
 | 
						|
 | 
						|
		if (cur_led->flags & ADP5520_FLAG_LED_MASK)
 | 
						|
			led_dat->flags = cur_led->flags;
 | 
						|
		else
 | 
						|
			led_dat->flags = i + 1;
 | 
						|
 | 
						|
		led_dat->id = led_dat->flags & ADP5520_FLAG_LED_MASK;
 | 
						|
 | 
						|
		led_dat->master = pdev->dev.parent;
 | 
						|
 | 
						|
		ret = led_classdev_register(led_dat->master, &led_dat->cdev);
 | 
						|
		if (ret) {
 | 
						|
			dev_err(&pdev->dev, "failed to register LED %d\n",
 | 
						|
				led_dat->id);
 | 
						|
			goto err;
 | 
						|
		}
 | 
						|
 | 
						|
		ret = adp5520_led_setup(led_dat);
 | 
						|
		if (ret) {
 | 
						|
			dev_err(&pdev->dev, "failed to write\n");
 | 
						|
			i++;
 | 
						|
			goto err;
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	platform_set_drvdata(pdev, led);
 | 
						|
	return 0;
 | 
						|
 | 
						|
err:
 | 
						|
	if (i > 0) {
 | 
						|
		for (i = i - 1; i >= 0; i--)
 | 
						|
			led_classdev_unregister(&led[i].cdev);
 | 
						|
	}
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
 | 
						|
static int adp5520_led_remove(struct platform_device *pdev)
 | 
						|
{
 | 
						|
	struct adp5520_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
 | 
						|
	struct adp5520_led *led;
 | 
						|
	int i;
 | 
						|
 | 
						|
	led = platform_get_drvdata(pdev);
 | 
						|
 | 
						|
	adp5520_clr_bits(led->master, ADP5520_LED_CONTROL,
 | 
						|
		 ADP5520_LED1_EN | ADP5520_LED2_EN | ADP5520_LED3_EN);
 | 
						|
 | 
						|
	for (i = 0; i < pdata->num_leds; i++) {
 | 
						|
		led_classdev_unregister(&led[i].cdev);
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static struct platform_driver adp5520_led_driver = {
 | 
						|
	.driver	= {
 | 
						|
		.name	= "adp5520-led",
 | 
						|
	},
 | 
						|
	.probe		= adp5520_led_probe,
 | 
						|
	.remove		= adp5520_led_remove,
 | 
						|
};
 | 
						|
 | 
						|
module_platform_driver(adp5520_led_driver);
 | 
						|
 | 
						|
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 | 
						|
MODULE_DESCRIPTION("LEDS ADP5520(01) Driver");
 | 
						|
MODULE_LICENSE("GPL");
 | 
						|
MODULE_ALIAS("platform:adp5520-led");
 |