summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-09-10 08:48:17 +0200
committerDavid S. Miller <davem@davemloft.net>2016-09-10 21:45:25 -0700
commit304f0a4edbbb2d273d7c6043df4126b623cd472c (patch)
treecce347c634dfac755e5b26d9b39dae0319059491
parentee41f07c2f2c944465ade7c9591a6139a783be41 (diff)
downloadlinux-stable-304f0a4edbbb2d273d7c6043df4126b623cd472c.tar.gz
linux-stable-304f0a4edbbb2d273d7c6043df4126b623cd472c.tar.bz2
linux-stable-304f0a4edbbb2d273d7c6043df4126b623cd472c.zip
ATM-nicstar: Refactor a kmalloc() call in ns_init_card()
* The script "checkpatch.pl" can point out that assignments should usually not be performed within condition checks. Thus move an assignment for a local variable to a separate statement in this function. * 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. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/atm/nicstar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index ef977bf54a40..04f5781dca30 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -370,7 +370,8 @@ static int ns_init_card(int i, struct pci_dev *pcidev)
return error;
}
- if ((card = kmalloc(sizeof(ns_dev), GFP_KERNEL)) == NULL) {
+ card = kmalloc(sizeof(*card), GFP_KERNEL);
+ if (!card) {
printk
("nicstar%d: can't allocate memory for device structure.\n",
i);