Skip to contentSkip to conversation

ACPI: platform: Get rid of redundant 'else'

PATCH In review Andy Shevchenko 2 participants 5 messages Aug 31, 2022 – Sep 3, 2022 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/4 ACPI: platform: Get rid of redundant 'else'

In the snippets like the following

	if (...)
		return / goto / break / continue ...;
	else
		...

the 'else' is redundant. Get rid of it.

---
v2: no changes

 drivers/acpi/acpi_platform.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/acpi_platform.c +2 -2
index 1a1c78b23fba..75e26528056d 100644
@@ -114,9 +114,9 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
 
 	INIT_LIST_HEAD(&resource_list);
 	count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
-	if (count < 0) {
+	if (count < 0)
 		return NULL;
-	} else if (count > 0) {
+	if (count > 0) {
 		resources = kcalloc(count, sizeof(struct resource),
 				    GFP_KERNEL);
 		if (!resources) {
Signature · 1 line
2.35.1
#1 lore raw

PATCH v2 2/4 ACPI: platform: Remove redundant print on -ENOMEM

We rely on somebody else to print enough information on memory allocation failures. So remove the log in
the acpi_create_platform_device() when return -ENOMEM.

---
v2: slightly modified commit message to be prettier

 drivers/acpi/acpi_platform.c | 1 -
 1 file changed, 1 deletion(-)
drivers/acpi/acpi_platform.c +0 -1
index 75e26528056d..042f80588c18 100644
@@ -120,7 +120,6 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
 		resources = kcalloc(count, sizeof(struct resource),
 				    GFP_KERNEL);
 		if (!resources) {
-			dev_err(&adev->dev, "No memory for resources\n");
 			acpi_dev_free_resource_list(&resource_list);
 			return ERR_PTR(-ENOMEM);
 		}
Signature · 1 line
2.35.1
#2 lore raw

PATCH v2 3/4 ACPI: platform: Use sizeof(*pointer) instead of sizeof(type)

In reply to Andy Shevchenko

It is preferred to use sizeof(*pointer) instead of sizeof(type). The type of the variable can change and one needs not change the former (unlike the latter). No functional change intended.

---
v2: no changes

 drivers/acpi/acpi_platform.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/acpi/acpi_platform.c +1 -2
index 042f80588c18..0d812fe248d4 100644
@@ -117,8 +117,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
 	if (count < 0)
 		return NULL;
 	if (count > 0) {
-		resources = kcalloc(count, sizeof(struct resource),
-				    GFP_KERNEL);
+		resources = kcalloc(count, sizeof(*resources), GFP_KERNEL);
 		if (!resources) {
 			acpi_dev_free_resource_list(&resource_list);
 			return ERR_PTR(-ENOMEM);
Signature · 1 line
2.35.1
#3 lore raw

PATCH v2 4/4 ACPI: platform: Sort forbidden_id_list[] in ascending order

In reply to Andy Shevchenko

For easier maintenance, sort the forbidden_id_list[] table rows in ascending order with respect to the device ID field.

While at it, use an empty row as the list terminator, which is more usual in the kernel.

---
v2 modified commit messages to be prettier (Rafael)

 drivers/acpi/acpi_platform.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/acpi/acpi_platform.c +3 -3
index 0d812fe248d4..f13409583cd9 100644
@@ -20,13 +20,13 @@
 #include "internal.h"
 
 static const struct acpi_device_id forbidden_id_list[] = {
+	{"ACPI0009", 0},	/* IOxAPIC */
+	{"ACPI000A", 0},	/* IOAPIC */
 	{"PNP0000",  0},	/* PIC */
 	{"PNP0100",  0},	/* Timer */
 	{"PNP0200",  0},	/* AT DMA Controller */
-	{"ACPI0009", 0},	/* IOxAPIC */
-	{"ACPI000A", 0},	/* IOAPIC */
 	{"SMB0001",  0},	/* ACPI SMBUS virtual device */
-	{"", 0},
+	{ }
 };
 
 static struct platform_device *acpi_platform_device_find_by_companion(struct acpi_device *adev)
Signature · 1 line
2.35.1
#4 lore raw
In reply to Andy Shevchenko
Quoted 23 lines · Andy Shevchenko

In the snippets like the following

        if (...)
                return / goto / break / continue ...;
        else
                ...

the 'else' is redundant. Get rid of it.

---
v2: no changes

 drivers/acpi/acpi_platform.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/acpi_platform.c +0 -0
index 1a1c78b23fba..75e26528056d 100644
@@ -114,9 +114,9 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev,
 
        INIT_LIST_HEAD(&resource_list);

drivers/acpi/acpi_platform.c struct platform_device *acpi_create_platform_device(struct acpi_device *adev,

Quoted 10 lines
drivers/acpi/acpi_platform.c +2 -3
        count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
-       if (count < 0) {
+       if (count < 0)
                return NULL;
-       } else if (count > 0) {
+       if (count > 0) {
                resources = kcalloc(count, sizeof(struct resource),
                                    GFP_KERNEL);
                if (!resources) {
--

Whole series applied as 6.1 material, thanks!