summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/omap2
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fbdev/omap2')
-rw-r--r--drivers/video/fbdev/omap2/omapfb/dss/dsi.c2
-rw-r--r--drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c4
-rw-r--r--drivers/video/fbdev/omap2/omapfb/dss/overlay.c2
-rw-r--r--drivers/video/fbdev/omap2/omapfb/omapfb-main.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index 19498b7ccb14..330d9fb7d2b0 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -1539,7 +1539,7 @@ static void dsi_dump_dsidev_irqs(struct platform_device *dsidev,
unsigned long flags;
struct dsi_irq_stats *stats;
- stats = kzalloc_obj(*stats, GFP_KERNEL);
+ stats = kzalloc_obj(*stats);
if (!stats) {
seq_printf(s, "out of memory\n");
return;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c b/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
index 098c02164428..154347e5ddaf 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c
@@ -46,7 +46,7 @@ static void __init omapdss_update_prop(struct device_node *node, char *compat,
{
struct property *prop;
- prop = kzalloc_obj(*prop, GFP_KERNEL);
+ prop = kzalloc_obj(*prop);
if (!prop)
return;
@@ -110,7 +110,7 @@ static void __init omapdss_omapify_node(struct device_node *node)
static void __init omapdss_add_to_list(struct device_node *node, bool root)
{
- struct dss_conv_node *n = kmalloc_obj(struct dss_conv_node, GFP_KERNEL);
+ struct dss_conv_node *n = kmalloc_obj(struct dss_conv_node);
if (n) {
n->node = node;
n->root = root;
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
index cb2a230c57a1..6b04162aa9fc 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/overlay.c
@@ -49,7 +49,7 @@ void dss_init_overlays(struct platform_device *pdev)
num_overlays = dss_feat_get_num_ovls();
- overlays = kzalloc_objs(struct omap_overlay, num_overlays, GFP_KERNEL);
+ overlays = kzalloc_objs(struct omap_overlay, num_overlays);
BUG_ON(overlays == NULL);
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index 599a7d6a6114..a8b2930290e1 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -2023,19 +2023,19 @@ static int omapfb_mode_to_timings(const char *mode_str,
var = NULL;
fbops = NULL;
- fbi = kzalloc_obj(*fbi, GFP_KERNEL);
+ fbi = kzalloc_obj(*fbi);
if (fbi == NULL) {
r = -ENOMEM;
goto err;
}
- var = kzalloc_obj(*var, GFP_KERNEL);
+ var = kzalloc_obj(*var);
if (var == NULL) {
r = -ENOMEM;
goto err;
}
- fbops = kzalloc_obj(*fbops, GFP_KERNEL);
+ fbops = kzalloc_obj(*fbops);
if (fbops == NULL) {
r = -ENOMEM;
goto err;
@@ -2244,7 +2244,7 @@ static int omapfb_find_best_mode(struct omap_dss_device *display,
if (r < 0)
goto err1;
- specs = kzalloc_obj(*specs, GFP_KERNEL);
+ specs = kzalloc_obj(*specs);
if (specs == NULL) {
r = -ENOMEM;
goto err1;