From: Markus Elfring <[email protected]>
Date: Wed, 24 Jan 2018 21:25:24 +0100
Three update suggestions were taken into account
from static source code analysis.
Markus Elfring (3):
Delete an error message for a failed memory allocation
in bcm5974_wellspring_mode()
Return directly after a failed kmalloc() in bcm5974_wellspring_mode()
Improve a size determination in bcm5974_probe()
drivers/input/mouse/bcm5974.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--
2.16.1
From: Markus Elfring <[email protected]>
Date: Wed, 24 Jan 2018 21:09:28 +0100
Omit an extra message for a memory allocation failure in this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <[email protected]>
---
drivers/input/mouse/bcm5974.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index d0122134f320..994805513df9 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -670,7 +670,6 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
data = kmalloc(c->um_size, GFP_KERNEL);
if (!data) {
- dev_err(&dev->intf->dev, "out of memory\n");
retval = -ENOMEM;
goto out;
}
--
2.16.1
From: Markus Elfring <[email protected]>
Date: Wed, 24 Jan 2018 21:21:11 +0100
Replace the specification of a data structure by a pointer dereference
as the parameter for the operator "sizeof" to make the corresponding size
determination a bit safer according to the Linux coding style convention.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <[email protected]>
---
drivers/input/mouse/bcm5974.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 685f56c08931..c827b31c8530 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -915,7 +915,7 @@ static int bcm5974_probe(struct usb_interface *iface,
cfg = bcm5974_get_config(udev);
/* allocate memory for our device state and initialize it */
- dev = kzalloc(sizeof(struct bcm5974), GFP_KERNEL);
+ dev = kzalloc(sizeof(*dev), GFP_KERNEL);
input_dev = input_allocate_device();
if (!dev || !input_dev) {
dev_err(&iface->dev, "out of memory\n");
--
2.16.1
From: Markus Elfring <[email protected]>
Date: Wed, 24 Jan 2018 21:14:51 +0100
Return directly after a call of the function "kmalloc" failed
at the beginning.
Signed-off-by: Markus Elfring <[email protected]>
---
drivers/input/mouse/bcm5974.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 994805513df9..685f56c08931 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -669,10 +669,8 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
return 0;
data = kmalloc(c->um_size, GFP_KERNEL);
- if (!data) {
- retval = -ENOMEM;
- goto out;
- }
+ if (!data)
+ return -ENOMEM;
/* read configuration */
size = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
--
2.16.1