Skip to contentSkip to conversation

NFC-digital: Adjustments for four function implementations

PATCH In review SF Markus Elfring 2 participants 4 messages May 22, 2017 – Jun 22, 2017

Subsystems (4)
Networking Network drivers Kernel janitors NFC
lore
Share & tools
lore

SF Markus Elfring

author
#0 lore raw

cover NFC-digital: Adjustments for four function implementations

From: Markus Elfring <[email protected]>
Date: Mon, 22 May 2017 14:50:05 +0200

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

Markus Elfring (2):
Improve a size determination in four functions
Delete an error message for a failed memory allocation in digital_in_send()

 net/nfc/digital_core.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
Signature · 1 line
2.13.0
author
#1 lore raw

PATCH 1/2 NFC: digital: Improve a size determination in four functions

From: Markus Elfring <[email protected]>
Date: Mon, 22 May 2017 14:11:01 +0200

Replace the specification of four data structures by pointer dereferences as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention.

Signed-off-by Markus Elfring <[email protected]>
---
 net/nfc/digital_core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
net/nfc/digital_core.c +4 -4
index 0fd5518bf252..3baf91f3ef80 100644
@@ -240,5 +240,5 @@ int digital_send_cmd(struct nfc_digital_dev *ddev, u8 cmd_type,
 {
 	struct digital_cmd *cmd;
 
-	cmd = kzalloc(sizeof(struct digital_cmd), GFP_KERNEL);
+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
 	if (!cmd)

@@ -287,5 +287,5 @@ static int digital_tg_listen_mdaa(struct nfc_digital_dev *ddev, u8 rf_tech)
 {
 	struct digital_tg_mdaa_params *params;
 
-	params = kzalloc(sizeof(struct digital_tg_mdaa_params), GFP_KERNEL);
+	params = kzalloc(sizeof(*params), GFP_KERNEL);
 	if (!params)

@@ -706,5 +706,5 @@ static int digital_in_send(struct nfc_dev *nfc_dev, struct nfc_target *target,
 	struct digital_data_exch *data_exch;
 	int rc;
 
-	data_exch = kzalloc(sizeof(struct digital_data_exch), GFP_KERNEL);
+	data_exch = kzalloc(sizeof(*data_exch), GFP_KERNEL);
 	if (!data_exch) {

@@ -764,5 +764,5 @@ struct nfc_digital_dev *nfc_digital_allocate_device(struct nfc_digital_ops *ops,
 	    !ops->switch_rf || (ops->tg_listen_md && !ops->tg_get_rf_tech))
 		return NULL;
 
-	ddev = kzalloc(sizeof(struct nfc_digital_dev), GFP_KERNEL);
+	ddev = kzalloc(sizeof(*ddev), GFP_KERNEL);
 	if (!ddev)
Signature · 1 line
2.13.0
author
#2 lore raw

PATCH 2/2 NFC: digital: Delete an error message for a failed memory allocation in digital_in_send()

In reply to SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 22 May 2017 14:24:24 +0200

Omit an extra message for a memory allocation failure in this function.

This issue was detected by using the Coccinelle software.

Link http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by Markus Elfring <[email protected]>
---
 net/nfc/digital_core.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
net/nfc/digital_core.c +1 -3
index 3baf91f3ef80..8e02a3e1b319 100644
@@ -710,7 +710,5 @@ static int digital_in_send(struct nfc_dev *nfc_dev, struct nfc_target *target,
-	if (!data_exch) {
-		pr_err("Failed to allocate data_exch struct\n");
+	if (!data_exch)
 		return -ENOMEM;
-	}
 
 	data_exch->cb = cb;
 	data_exch->cb_context = cb_context;
Signature · 1 line
2.13.0
#3 lore raw
In reply to SF Markus Elfring

Hi Markus,

Quoted 9 lines · SF Markus Elfring

From: Markus Elfring <[email protected]>
Date: Mon, 22 May 2017 14:50:05 +0200

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

Markus Elfring (2):
Improve a size determination in four functions
Delete an error message for a failed memory allocation in digital_in_send()

Both patches applied to nfc-next, thanks.

Cheers,
Samuel.