media: pci: ivtv: Replace GFP_ATOMIC with GFP_KERNEL

ivtv_probe() and ivtvfb_init_card() are never called in atomic context.
They call kzalloc() 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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 6b2ffdc96961f3fe8a1ccffe28c89bfa1cec11fa..dd727098daf47d3d2dbac2e390881a77a0b704ba 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -999,7 +999,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
        int vbi_buf_size;
        struct ivtv *itv;
 
-       itv = kzalloc(sizeof(struct ivtv), GFP_ATOMIC);
+       itv = kzalloc(sizeof(struct ivtv), GFP_KERNEL);
        if (itv == NULL)
                return -ENOMEM;
        itv->pdev = pdev;

diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c
index b19058e36853deac8bb5d2d0b17c88eb8416edb3..5ddaa8ed11a566c8fcc405ce60c9617c84f91e41 100644 (file)
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@ -1178,7 +1178,7 @@ static int ivtvfb_init_card(struct ivtv *itv)
        }
 
        itv->osd_info = kzalloc(sizeof(struct osd_info),
-                                       GFP_ATOMIC|__GFP_NOWARN);
+                                       GFP_KERNEL|__GFP_NOWARN);
        if (itv->osd_info == NULL) {
                IVTVFB_ERR("Failed to allocate memory for osd_info\n");
                return -ENOMEM;