diff options
author | Jia-Ju Bai <baijiaju1990@gmail.com> | 2018-07-26 23:47:39 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-07-30 23:17:53 -0400 |
commit | 508385001c09ee648c46f3d2bf5584e366007fd7 (patch) | |
tree | d224cae9fe9fb61d41f84965619ec2758ef7cee8 | |
parent | cc74e31d4147f26ead6ea06e4649d63a14edc0fe (diff) |
scsi: message: fusion: Replace GFP_ATOMIC with GFP_KERNEL
mpt_attach() and mptfc_probe() are never called in atomic context. They
call kzalloc() and kcalloc() with GFP_ATOMIC, which is not necessary.
GFP_ATOMIC can be replaced with GFP_KERNEL.
This is found by a static analysis tool named DCNS written by myself.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/message/fusion/mptbase.c | 2 | ||||
-rw-r--r-- | drivers/message/fusion/mptfc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index c8c8186f1148..e6b4ae558767 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -1780,7 +1780,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1780 | struct proc_dir_entry *dent; | 1780 | struct proc_dir_entry *dent; |
1781 | #endif | 1781 | #endif |
1782 | 1782 | ||
1783 | ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC); | 1783 | ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_KERNEL); |
1784 | if (ioc == NULL) { | 1784 | if (ioc == NULL) { |
1785 | printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n"); | 1785 | printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n"); |
1786 | return -ENOMEM; | 1786 | return -ENOMEM; |
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index 06b175420be9..b15fdc626fb8 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
@@ -1292,7 +1292,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
1292 | /* SCSI needs scsi_cmnd lookup table! | 1292 | /* SCSI needs scsi_cmnd lookup table! |
1293 | * (with size equal to req_depth*PtrSz!) | 1293 | * (with size equal to req_depth*PtrSz!) |
1294 | */ | 1294 | */ |
1295 | ioc->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC); | 1295 | ioc->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_KERNEL); |
1296 | if (!ioc->ScsiLookup) { | 1296 | if (!ioc->ScsiLookup) { |
1297 | error = -ENOMEM; | 1297 | error = -ENOMEM; |
1298 | goto out_mptfc_probe; | 1298 | goto out_mptfc_probe; |