Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50838500 authored by Jia-Ju Bai's avatar Jia-Ju Bai Committed by Martin K. Petersen
Browse files

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: default avatarJia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cc74e31d

drivers/message/fusion/mptbase.c

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct proc_dir_entry *dent;

#endif



	ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);

	ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_KERNEL);

	if (ioc == NULL) {

		printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");

		return -ENOMEM;

drivers/message/fusion/mptfc.c

+1 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	/* SCSI needs scsi_cmnd lookup table!

	 * (with size equal to req_depth*PtrSz!)

	 */

	ioc->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_ATOMIC);

	ioc->ScsiLookup = kcalloc(ioc->req_depth, sizeof(void *), GFP_KERNEL);

	if (!ioc->ScsiLookup) {

		error = -ENOMEM;

		goto out_mptfc_probe;