fbdev: Remove FBINFO_FLAG_DEFAULT from framebuffer_alloc()'ed structs

The flag FBINFO_FLAG_DEFAULT is 0 and has no effect, as struct
fbinfo.flags has been allocated to zero by framebuffer_alloc(). So
do not set it.

Flags should signal differences from the default values. After cleaning
up all occurrences of FBINFO_DEFAULT, the token will be removed.

v4:
	* clarify commit message (Geert, Dan)
v2:
	* fix commit message (Miguel)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Jaya Kumar <jayalk@intworks.biz>
Cc: Helge Deller <deller@gmx.de>
Cc: Peter Jones <pjones@redhat.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Maik Broemme <mbroemme@libmpq.org>
Cc: Jingoo Han <jingoohan1@gmail.com>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Teddy Wang <teddy.wang@siliconmotion.com>
Cc: Michal Januszewski <spock@gentoo.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230715185343.7193-15-tzimmermann@suse.de

diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
index 9aaea3be82811a4ff81f18df78c94262d48cda04..cff11cb04a551aee1c6becc3d9506d1f5d8bb3f4 100644 (file)
--- a/drivers/video/fbdev/arcfb.c
+++ b/drivers/video/fbdev/arcfb.c
@@ -546,7 +546,6 @@ static int arcfb_probe(struct platform_device *dev)
        par->c2io_addr = c2io_addr;
        par->cslut[0] = 0x00;
        par->cslut[1] = 0x06;
-       info->flags = FBINFO_FLAG_DEFAULT;
        spin_lock_init(&par->lock);
        if (irq) {
                par->irq = irq;

diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
index 2d9320a52e5193495c3ebb24a539ad2b2b364368..b44fc78ccd4faadca30d9a0b0c164cfdc0f1853d 100644 (file)
--- a/drivers/video/fbdev/aty/aty128fb.c
+++ b/drivers/video/fbdev/aty/aty128fb.c
@@ -1927,7 +1927,6 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        /* fill in info */
        info->fbops = &aty128fb_ops;
-       info->flags = FBINFO_FLAG_DEFAULT;
 
        par->lcd_on = default_lcd_on;
        par->crt_on = default_crt_on;

diff --git a/drivers/video/fbdev/broadsheetfb.c b/drivers/video/fbdev/broadsheetfb.c
index f7b69d5aa476d34437d54d21664ed02206bc38d5..bace1f04fc8e026d4b914d1edfc6e6a72e8fdba5 100644 (file)
--- a/drivers/video/fbdev/broadsheetfb.c
+++ b/drivers/video/fbdev/broadsheetfb.c
@@ -1069,7 +1069,7 @@ static int broadsheetfb_probe(struct platform_device *dev)
 
        mutex_init(&par->io_lock);
 
-       info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
+       info->flags = FBINFO_VIRTFB;
 
        info->fbdefio = &broadsheetfb_defio;
        fb_deferred_io_init(info);

diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 60cd1286370f163b3d885c0dbbdcf9d3b818e135..988dedcf6be80de3ac23d5ebc8cbb2106cd178f9 100644 (file)
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -1463,7 +1463,6 @@ static int fb_probe(struct platform_device *device)
        da8xx_fb_var.bits_per_pixel = lcd_cfg->bpp;
 
        /* Initialize fbinfo */
-       da8xx_fb_info->flags = FBINFO_FLAG_DEFAULT;
        da8xx_fb_info->fix = da8xx_fb_fix;
        da8xx_fb_info->var = da8xx_fb_var;
        da8xx_fb_info->fbops = &da8xx_fb_ops;

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 3d7be69ab593fbc6c97f774f1f2fe2f45f510505..3391c8e842106c8aac8fba45aabf7626c1bc4cd1 100644 (file)
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -555,7 +555,6 @@ static int efifb_probe(struct platform_device *dev)
        info->fbops = &efifb_ops;
        info->var = efifb_defined;
        info->fix = efifb_fix;
-       info->flags = FBINFO_FLAG_DEFAULT;
 
        orientation = drm_get_panel_orientation_quirk(efifb_defined.xres,
                                                      efifb_defined.yres);

diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c
index 6fa2108fd912de0a4879094417d8b61febc6f2c1..ef2528c3faa9bd24881f8e9eea2e7ba13a923666 100644 (file)
--- a/drivers/video/fbdev/goldfishfb.c
+++ b/drivers/video/fbdev/goldfishfb.c
@@ -212,7 +212,6 @@ static int goldfish_fb_probe(struct platform_device *pdev)
        height = readl(fb->reg_base + FB_GET_HEIGHT);
 
        fb->fb.fbops            = &goldfish_fb_ops;
-       fb->fb.flags            = FBINFO_FLAG_DEFAULT;
        fb->fb.pseudo_palette   = fb->cmap;
        fb->fb.fix.type         = FB_TYPE_PACKED_PIXELS;
        fb->fb.fix.visual = FB_VISUAL_TRUECOLOR;

diff --git a/drivers/video/fbdev/gxt4500.c b/drivers/video/fbdev/gxt4500.c
index 5f42d3d9d6cef66301252a302bc07a59040d3166..8d0976578ddf3a95754727e3e5f31cbe8d558c3b 100644 (file)
--- a/drivers/video/fbdev/gxt4500.c
+++ b/drivers/video/fbdev/gxt4500.c
@@ -690,8 +690,7 @@ static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 
        info->fbops = &gxt4500_ops;
-       info->flags = FBINFO_FLAG_DEFAULT | FBINFO_HWACCEL_XPAN |
-                                           FBINFO_HWACCEL_YPAN;
+       info->flags = FBINFO_HWACCEL_XPAN | FBINFO_HWACCEL_YPAN;
 
        err = fb_alloc_cmap(&info->cmap, 256, 0);
        if (err) {

diff --git a/drivers/video/fbdev/hecubafb.c b/drivers/video/fbdev/hecubafb.c
index 5043d08ade5435aa01aca0ae3bea5a6b69f3f3b0..c4938554ea451f30a323da6e71a52e0ecf6512af 100644 (file)
--- a/drivers/video/fbdev/hecubafb.c
+++ b/drivers/video/fbdev/hecubafb.c
@@ -189,7 +189,7 @@ static int hecubafb_probe(struct platform_device *dev)
        par->send_command = apollo_send_command;
        par->send_data = apollo_send_data;
 
-       info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
+       info->flags = FBINFO_VIRTFB;
 
        info->fbdefio = &hecubafb_defio;
        fb_deferred_io_init(info);

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index adf36690c342b06099f48e9f18c4c73303629617..5b1ddce1f9d3e5c703c0b2b7571d3f60fae64d03 100644 (file)
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -698,8 +698,7 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
        info->var.vmode                 = FB_VMODE_NONINTERLACED;
 
        info->fbops                     = &imxfb_ops;
-       info->flags                     = FBINFO_FLAG_DEFAULT |
-                                         FBINFO_READS_FAST;
+       info->flags                     = FBINFO_READS_FAST;
 
        np = pdev->dev.of_node;
        info->var.grayscale = of_property_read_bool(np,

diff --git a/drivers/video/fbdev/intelfb/intelfbdrv.c b/drivers/video/fbdev/intelfb/intelfbdrv.c
index 85a6341b8ac0aeefcaf9f616f6029067044db7d0..3d334f17195966be46476e718a16ad07f59cb165 100644 (file)
--- a/drivers/video/fbdev/intelfb/intelfbdrv.c
+++ b/drivers/video/fbdev/intelfb/intelfbdrv.c
@@ -1098,7 +1098,6 @@ static int intelfb_set_fbinfo(struct intelfb_info *dinfo)
 
        DBG_MSG("intelfb_set_fbinfo\n");
 
-       info->flags = FBINFO_FLAG_DEFAULT;
        info->fbops = &intel_fb_ops;
        info->pseudo_palette = dinfo->pseudo_palette;
 

diff --git a/drivers/video/fbdev/metronomefb.c b/drivers/video/fbdev/metronomefb.c
index 12565eeb502c4625e56a2501c37747ffa36d8150..eb15b9dbdec86a4ad63110ea966a798fe1442ea7 100644 (file)
--- a/drivers/video/fbdev/metronomefb.c
+++ b/drivers/video/fbdev/metronomefb.c
@@ -642,7 +642,7 @@ static int metronomefb_probe(struct platform_device *dev)
        if (retval < 0)
                goto err_free_irq;
 
-       info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
+       info->flags = FBINFO_VIRTFB;
 
        info->fbdefio = &metronomefb_defio;
        fb_deferred_io_init(info);

diff --git a/drivers/video/fbdev/mx3fb.c b/drivers/video/fbdev/mx3fb.c
index 63c186e0364aab4e39dfa970bf90f9fd9f4cc773..3a053005d2b972d9d09d79e6afd00e00513e99b6 100644 (file)
--- a/drivers/video/fbdev/mx3fb.c
+++ b/drivers/video/fbdev/mx3fb.c
@@ -1406,7 +1406,6 @@ static struct fb_info *mx3fb_init_fbinfo(struct device *dev,
        fbi->var.activate       = FB_ACTIVATE_NOW;
 
        fbi->fbops              = ops;
-       fbi->flags              = FBINFO_FLAG_DEFAULT;
        fbi->pseudo_palette     = mx3fbi->pseudo_palette;
 
        mutex_init(&mx3fbi->mutex);

diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c
index ad65554b33c358cfc0e2ba8e3ec2d1854f6dd9fb..783bbe026207b6ba5d8b82af2f077c5621f5ab54 100644 (file)
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -1451,7 +1451,6 @@ static int fbinfo_init(struct omapfb_device *fbdev, struct fb_info *info)
        int                             r = 0;
 
        info->fbops = &omapfb_ops;
-       info->flags = FBINFO_FLAG_DEFAULT;
 
        strscpy(fix->id, MODULE_NAME, sizeof(fix->id));
 

diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index c0538069eb48e51f207d97483357d79ad46b13ad..b5acad8eb27966c0872b8be7f8a2885be3d66f2c 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1732,7 +1732,6 @@ static int omapfb_fb_init(struct omapfb2_device *fbdev, struct fb_info *fbi)
        int r = 0;
 
        fbi->fbops = &omapfb_ops;
-       fbi->flags = FBINFO_FLAG_DEFAULT;
        fbi->pseudo_palette = fbdev->pseudo_palette;
 
        if (ofbi->region->size == 0) {

diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index 1ce707e4cfd03e0bb1b8dcc5499977b55ce8239b..c50b92c06c5d3e218fbcbfb4936202be23636c6f 100644 (file)
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -1244,7 +1244,6 @@ static int s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
        fbinfo->var.vmode       = FB_VMODE_NONINTERLACED;
        fbinfo->var.bits_per_pixel = windata->default_bpp;
        fbinfo->fbops           = &s3c_fb_ops;
-       fbinfo->flags           = FBINFO_FLAG_DEFAULT;
        fbinfo->pseudo_palette  = &win->pseudo_palette;
 
        /* prepare to actually start the framebuffer */

diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
index 0adb2ba965e7120d39507b5bcb466cbfa61ddd34..1364dafaadb1d4632d95ca8be37a84d341734336 100644 (file)
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
@@ -1565,7 +1565,6 @@ sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl)
 
        ovl->info = info;
 
-       info->flags = FBINFO_FLAG_DEFAULT;
        info->fbops = &sh_mobile_lcdc_overlay_ops;
        info->device = priv->dev;
        info->screen_buffer = ovl->fb_mem;
@@ -2052,7 +2051,6 @@ sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch,
 
        ch->info = info;
 
-       info->flags = FBINFO_FLAG_DEFAULT;
        info->fbops = &sh_mobile_lcdc_ops;
        info->device = priv->dev;
        info->screen_buffer = ch->fb_mem;

diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
index 2beb3512a853658c46c4608271660f0e5505aca9..0f5374f6ef055996b0345ba2bdc81103c1926a96 100644 (file)
--- a/drivers/video/fbdev/sis/sis_main.c
+++ b/drivers/video/fbdev/sis/sis_main.c
@@ -6477,8 +6477,6 @@ error_3:  vfree(ivideo->bios_abase);
                                     FBINFO_HWACCEL_COPYAREA    |
                                     FBINFO_HWACCEL_FILLRECT    |
                                     ((ivideo->accel) ? 0 : FBINFO_HWACCEL_DISABLED);
-#else
-               sis_fb_info->flags = FBINFO_FLAG_DEFAULT;
 #endif
                sis_fb_info->var = ivideo->default_var;
                sis_fb_info->fix = ivideo->sisfb_fix;

diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c
index 46951a0952741ce290a6bfdcf5681e2e1d1b33c5..65c799ac5604f5a80f159ac0607a68eef82c170a 100644 (file)
--- a/drivers/video/fbdev/sm501fb.c
+++ b/drivers/video/fbdev/sm501fb.c
@@ -1731,7 +1731,7 @@ static int sm501fb_init_fb(struct fb_info *fb, enum sm501_controller head,
                par->ops.fb_cursor = NULL;
 
        fb->fbops = &par->ops;
-       fb->flags = FBINFO_FLAG_DEFAULT | FBINFO_READS_FAST |
+       fb->flags = FBINFO_READS_FAST |
                FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT |
                FBINFO_HWACCEL_XPAN | FBINFO_HWACCEL_YPAN;
 

diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c
index f929091da4e77e781bb48f0bc0a2fa7019aa606e..db129ed3b2f7cfd52889ab29a32138fb7b92db81 100644 (file)
--- a/drivers/video/fbdev/sm712fb.c
+++ b/drivers/video/fbdev/sm712fb.c
@@ -1528,7 +1528,6 @@ static int smtcfb_pci_probe(struct pci_dev *pdev,
        sfb->fb = info;
        sfb->chip_id = ent->device;
        sfb->pdev = pdev;
-       info->flags = FBINFO_FLAG_DEFAULT;
        info->fbops = &smtcfb_ops;
        info->fix = smtcfb_fix;
        info->var = smtcfb_var;

diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index 78d85dae8ec8005a0814747575345b40c3facc8b..df2574d4ff30aba462403b91420a0188d4eaa9ce 100644 (file)
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c
@@ -1508,8 +1508,7 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
                par->ypan = 0;
        }
 
-       info->flags = FBINFO_FLAG_DEFAULT |
-                       (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
+       info->flags = (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
 
        if (!par->ypan)
                uvesafb_ops.fb_pan_display = NULL;

diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
index 7451c607dc5078cac76a2c2191203c25cc2b36ca..422a1c53decd9ac6dbc7ba0ecaccefa43d7a4a99 100644 (file)
--- a/drivers/video/fbdev/vesafb.c
+++ b/drivers/video/fbdev/vesafb.c
@@ -457,7 +457,7 @@ static int vesafb_probe(struct platform_device *dev)
        info->fbops = &vesafb_ops;
        info->var = vesafb_defined;
        info->fix = vesafb_fix;
-       info->flags = FBINFO_FLAG_DEFAULT | (ypan ? FBINFO_HWACCEL_YPAN : 0);
+       info->flags = (ypan ? FBINFO_HWACCEL_YPAN : 0);
 
        if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
                err = -ENOMEM;

diff --git a/drivers/video/fbdev/vfb.c b/drivers/video/fbdev/vfb.c
index cf3c72754ce702f66c66f624fbee0f7553756c51..1b7c338f99560fc4a3bca8cdfe9ba2d495ca3eaf 100644 (file)
--- a/drivers/video/fbdev/vfb.c
+++ b/drivers/video/fbdev/vfb.c
@@ -455,7 +455,6 @@ static int vfb_probe(struct platform_device *dev)
        info->fix = vfb_fix;
        info->pseudo_palette = info->par;
        info->par = NULL;
-       info->flags = FBINFO_FLAG_DEFAULT;
 
        retval = fb_alloc_cmap(&info->cmap, 256, 0);
        if (retval < 0)

diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c
index 34d00347ad58a6c800db39cd126ec44af8f3770a..b43c874c199f679f7d3c4e063b3a7f4bda4c97da 100644 (file)
--- a/drivers/video/fbdev/vga16fb.c
+++ b/drivers/video/fbdev/vga16fb.c
@@ -1359,7 +1359,7 @@ static int vga16fb_probe(struct platform_device *dev)
        info->fix = vga16fb_fix;
        /* supports rectangles with widths of multiples of 8 */
        info->pixmap.blit_x = 1 << 7 | 1 << 15 | 1 << 23 | 1 << 31;
-       info->flags = FBINFO_FLAG_DEFAULT | FBINFO_HWACCEL_YPAN;
+       info->flags = FBINFO_HWACCEL_YPAN;
 
        i = (info->var.bits_per_pixel == 8) ? 256 : 16;
        ret = fb_alloc_cmap(&info->cmap, i, 0);

diff --git a/drivers/video/fbdev/xen-fbfront.c b/drivers/video/fbdev/xen-fbfront.c
index 6664dc7a5a4176f80f6abd0e6090e34845f8d9a6..9a4c29cb1a806a7d9b0c9fd5f4b9b8767156efa7 100644 (file)
--- a/drivers/video/fbdev/xen-fbfront.c
+++ b/drivers/video/fbdev/xen-fbfront.c
@@ -432,7 +432,7 @@ static int xenfb_probe(struct xenbus_device *dev,
        fb_info->fix.type = FB_TYPE_PACKED_PIXELS;
        fb_info->fix.accel = FB_ACCEL_NONE;
 
-       fb_info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
+       fb_info->flags = FBINFO_VIRTFB;
 
        ret = fb_alloc_cmap(&fb_info->cmap, 256, 0);
        if (ret < 0) {