TTY-goldfish: small adjustments for two function implementations

PATCH New SF Markus Elfring 1 participant 3 messages Apr 11, 2017

Subsystems (2)

Kernel janitors TTY layer and serial drivers

lore

Share & tools

lore

SF Markus Elfring

author

2017-04-11 18:26 UTC #0 lore raw

cover TTY-goldfish: small adjustments for two function implementations

From: Markus Elfring <[email protected]>
Date: Tue, 11 Apr 2017 20:22:10 +0200

Two update suggestions were taken into account
from static source code analysis.

Markus Elfring (2):
Use kcalloc() in goldfish_tty_create_driver()
Adjust five checks for null pointers

 drivers/tty/goldfish.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Signature · 1 line

2.12.2

SF Markus Elfring

author

2017-04-11 18:28 UTC #1 lore raw

PATCH 1/2 tty-goldfish: Use kcalloc() in goldfish_tty_create_driver()

From: Markus Elfring <[email protected]>
Date: Tue, 11 Apr 2017 20:00:23 +0200

A multiplication for the size determination of a memory allocation indicated that an array data structure should be processed. Thus use the corresponding function "kcalloc".

This issue was detected by using the Coccinelle software.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/tty/goldfish.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/tty/goldfish.c +2 -2

index 996bd473dd03..b92c3312ecd2 100644
@@ -180,8 +180,8 @@ static int goldfish_tty_create_driver(void)
 	int ret;
 	struct tty_driver *tty;
 
-	goldfish_ttys = kzalloc(sizeof(*goldfish_ttys) *
-				goldfish_tty_line_count, GFP_KERNEL);
+	goldfish_ttys = kcalloc(goldfish_tty_line_count, sizeof(*goldfish_ttys),
+				GFP_KERNEL);
 	if (goldfish_ttys = NULL) {
 		ret = -ENOMEM;
 		goto err_alloc_goldfish_ttys_failed;

Signature · 1 line

2.12.2

SF Markus Elfring

author

2017-04-11 18:30 UTC #2 lore raw

PATCH 2/2 tty-goldfish: Adjust five checks for null pointers

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Tue, 11 Apr 2017 20:15:30 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl” pointed information out like the following.

Comparison to NULL could be written !…

Thus fix the affected source code places.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/tty/goldfish.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

drivers/tty/goldfish.c +5 -5

index b92c3312ecd2..a07e5b01c279 100644
@@ -182,12 +182,12 @@ static int goldfish_tty_create_driver(void)
 
 	goldfish_ttys = kcalloc(goldfish_tty_line_count, sizeof(*goldfish_ttys),
 				GFP_KERNEL);
-	if (goldfish_ttys = NULL) {
+	if (!goldfish_ttys) {
 		ret = -ENOMEM;
 		goto err_alloc_goldfish_ttys_failed;
 	}
 	tty = alloc_tty_driver(goldfish_tty_line_count);
-	if (tty = NULL) {
+	if (!tty) {
 		ret = -ENOMEM;
 		goto err_alloc_tty_driver_failed;
 	}

@@ -235,15 +235,15 @@ static int goldfish_tty_probe(struct platform_device *pdev)
 	unsigned int line;
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (r = NULL)
+	if (!r)
 		return -EINVAL;
 
 	base = ioremap(r->start, 0x1000);
-	if (base = NULL)
+	if (!base)
 		pr_err("goldfish_tty: unable to remap base\n");
 
 	r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-	if (r = NULL)
+	if (!r)
 		goto err_unmap;
 
 	irq = r->start;

Signature · 1 line

2.12.2