diff mbox series

[v2] hwmon: Correct struct allocation style

Message ID 20190627152738.29645-1-fabian.schindlatz@fau.de (mailing list archive)
State Accepted
Headers show
Series [v2] hwmon: Correct struct allocation style | expand

Commit Message

Fabian Schindlatz June 27, 2019, 3:27 p.m. UTC 
Use sizeof(*var) instead of sizeof(struct var_type) as argument to
kalloc() and friends to comply with the kernel coding style.

Co-developed-by: Thomas Röthenbacher <thomas.roethenbacher@fau.de>
Signed-off-by: Thomas Röthenbacher <thomas.roethenbacher@fau.de>
Signed-off-by: Fabian Schindlatz <fabian.schindlatz@fau.de>
Cc: linux-kernel@i4.cs.fau.de
---
 drivers/hwmon/acpi_power_meter.c | 3 +--
 drivers/hwmon/coretemp.c         | 4 ++--
 drivers/hwmon/fschmd.c           | 2 +-
 drivers/hwmon/sch56xx-common.c   | 2 +-
 drivers/hwmon/via-cputemp.c      | 5 ++---
 drivers/hwmon/w83793.c           | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

Comments

Guenter Roeck June 28, 2019, 1:28 p.m. UTC | #1 
On Thu, Jun 27, 2019 at 05:27:38PM +0200, Fabian Schindlatz wrote:
> Use sizeof(*var) instead of sizeof(struct var_type) as argument to
> kalloc() and friends to comply with the kernel coding style.
> 
> Co-developed-by: Thomas Röthenbacher <thomas.roethenbacher@fau.de>
> Signed-off-by: Thomas Röthenbacher <thomas.roethenbacher@fau.de>
> Signed-off-by: Fabian Schindlatz <fabian.schindlatz@fau.de>
> Cc: linux-kernel@i4.cs.fau.de

Applied to hwmon-next. Note that it is in general much easier for me
if such patches are applied against mainline (or hwmon-next), not
against linux-next.

Guenter

> ---
>  drivers/hwmon/acpi_power_meter.c | 3 +--
>  drivers/hwmon/coretemp.c         | 4 ++--
>  drivers/hwmon/fschmd.c           | 2 +-
>  drivers/hwmon/sch56xx-common.c   | 2 +-
>  drivers/hwmon/via-cputemp.c      | 5 ++---
>  drivers/hwmon/w83793.c           | 2 +-
>  6 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
> index 6ba1a08253f0..48c4570c61d7 100644
> --- a/drivers/hwmon/acpi_power_meter.c
> +++ b/drivers/hwmon/acpi_power_meter.c
> @@ -862,8 +862,7 @@ static int acpi_power_meter_add(struct acpi_device *device)
>  	if (!device)
>  		return -EINVAL;
>  
> -	resource = kzalloc(sizeof(struct acpi_power_meter_resource),
> -			   GFP_KERNEL);
> +	resource = kzalloc(sizeof(*resource), GFP_KERNEL);
>  	if (!resource)
>  		return -ENOMEM;
>  
> diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
> index fe6618e49dc4..0361115d25dd 100644
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@ -433,7 +433,7 @@ static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
>  {
>  	struct temp_data *tdata;
>  
> -	tdata = kzalloc(sizeof(struct temp_data), GFP_KERNEL);
> +	tdata = kzalloc(sizeof(*tdata), GFP_KERNEL);
>  	if (!tdata)
>  		return NULL;
>  
> @@ -532,7 +532,7 @@ static int coretemp_probe(struct platform_device *pdev)
>  	struct platform_data *pdata;
>  
>  	/* Initialize the per-zone data structures */
> -	pdata = devm_kzalloc(dev, sizeof(struct platform_data), GFP_KERNEL);
> +	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
>  	if (!pdata)
>  		return -ENOMEM;
>  
> diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
> index fa0c2f1fb443..d464dcbe5ac8 100644
> --- a/drivers/hwmon/fschmd.c
> +++ b/drivers/hwmon/fschmd.c
> @@ -1090,7 +1090,7 @@ static int fschmd_probe(struct i2c_client *client,
>  	int i, err;
>  	enum chips kind = id->driver_data;
>  
> -	data = kzalloc(sizeof(struct fschmd_data), GFP_KERNEL);
> +	data = kzalloc(sizeof(*data), GFP_KERNEL);
>  	if (!data)
>  		return -ENOMEM;
>  
> diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
> index 6c84780e358e..0d6d20814183 100644
> --- a/drivers/hwmon/sch56xx-common.c
> +++ b/drivers/hwmon/sch56xx-common.c
> @@ -401,7 +401,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,
>  		return NULL;
>  	}
>  
> -	data = kzalloc(sizeof(struct sch56xx_watchdog_data), GFP_KERNEL);
> +	data = kzalloc(sizeof(*data), GFP_KERNEL);
>  	if (!data)
>  		return NULL;
>  
> diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
> index 8264e849e588..0feb1d0b5e13 100644
> --- a/drivers/hwmon/via-cputemp.c
> +++ b/drivers/hwmon/via-cputemp.c
> @@ -114,8 +114,7 @@ static int via_cputemp_probe(struct platform_device *pdev)
>  	int err;
>  	u32 eax, edx;
>  
> -	data = devm_kzalloc(&pdev->dev, sizeof(struct via_cputemp_data),
> -			    GFP_KERNEL);
> +	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
>  	if (!data)
>  		return -ENOMEM;
>  
> @@ -223,7 +222,7 @@ static int via_cputemp_online(unsigned int cpu)
>  		goto exit;
>  	}
>  
> -	pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL);
> +	pdev_entry = kzalloc(sizeof(*pdev_entry), GFP_KERNEL);
>  	if (!pdev_entry) {
>  		err = -ENOMEM;
>  		goto exit_device_put;
> diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
> index 46f5dfec8d0a..b37106c6f26d 100644
> --- a/drivers/hwmon/w83793.c
> +++ b/drivers/hwmon/w83793.c
> @@ -1669,7 +1669,7 @@ static int w83793_probe(struct i2c_client *client,
>  	int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5;
>  	int files_temp = ARRAY_SIZE(w83793_temp) / 6;
>  
> -	data = kzalloc(sizeof(struct w83793_data), GFP_KERNEL);
> +	data = kzalloc(sizeof(*data), GFP_KERNEL);
>  	if (!data) {
>  		err = -ENOMEM;
>  		goto exit;
diff mbox series

Patch

diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
index 6ba1a08253f0..48c4570c61d7 100644
--- a/drivers/hwmon/acpi_power_meter.c
+++ b/drivers/hwmon/acpi_power_meter.c
@@ -862,8 +862,7 @@  static int acpi_power_meter_add(struct acpi_device *device)
 	if (!device)
 		return -EINVAL;
 
-	resource = kzalloc(sizeof(struct acpi_power_meter_resource),
-			   GFP_KERNEL);
+	resource = kzalloc(sizeof(*resource), GFP_KERNEL);
 	if (!resource)
 		return -ENOMEM;
 
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index fe6618e49dc4..0361115d25dd 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -433,7 +433,7 @@  static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
 {
 	struct temp_data *tdata;
 
-	tdata = kzalloc(sizeof(struct temp_data), GFP_KERNEL);
+	tdata = kzalloc(sizeof(*tdata), GFP_KERNEL);
 	if (!tdata)
 		return NULL;
 
@@ -532,7 +532,7 @@  static int coretemp_probe(struct platform_device *pdev)
 	struct platform_data *pdata;
 
 	/* Initialize the per-zone data structures */
-	pdata = devm_kzalloc(dev, sizeof(struct platform_data), GFP_KERNEL);
+	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
 	if (!pdata)
 		return -ENOMEM;
 
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c
index fa0c2f1fb443..d464dcbe5ac8 100644
--- a/drivers/hwmon/fschmd.c
+++ b/drivers/hwmon/fschmd.c
@@ -1090,7 +1090,7 @@  static int fschmd_probe(struct i2c_client *client,
 	int i, err;
 	enum chips kind = id->driver_data;
 
-	data = kzalloc(sizeof(struct fschmd_data), GFP_KERNEL);
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)
 		return -ENOMEM;
 
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c
index 6c84780e358e..0d6d20814183 100644
--- a/drivers/hwmon/sch56xx-common.c
+++ b/drivers/hwmon/sch56xx-common.c
@@ -401,7 +401,7 @@  struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent,
 		return NULL;
 	}
 
-	data = kzalloc(sizeof(struct sch56xx_watchdog_data), GFP_KERNEL);
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)
 		return NULL;
 
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 8264e849e588..0feb1d0b5e13 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -114,8 +114,7 @@  static int via_cputemp_probe(struct platform_device *pdev)
 	int err;
 	u32 eax, edx;
 
-	data = devm_kzalloc(&pdev->dev, sizeof(struct via_cputemp_data),
-			    GFP_KERNEL);
+	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
 	if (!data)
 		return -ENOMEM;
 
@@ -223,7 +222,7 @@  static int via_cputemp_online(unsigned int cpu)
 		goto exit;
 	}
 
-	pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL);
+	pdev_entry = kzalloc(sizeof(*pdev_entry), GFP_KERNEL);
 	if (!pdev_entry) {
 		err = -ENOMEM;
 		goto exit_device_put;
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index 46f5dfec8d0a..b37106c6f26d 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -1669,7 +1669,7 @@  static int w83793_probe(struct i2c_client *client,
 	int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5;
 	int files_temp = ARRAY_SIZE(w83793_temp) / 6;
 
-	data = kzalloc(sizeof(struct w83793_data), GFP_KERNEL);
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data) {
 		err = -ENOMEM;
 		goto exit;