[PATCH] fbdev cleanup

	fbdev.node converted from kdev_t to int - all of its users
have register_framebuffer() which sets .node to mk_kdev(FB_MAJOR, index)
already called and all of them start with applying minor().  IOW, what
they actually want is framebuffer number.

	* type of ->node changed to int
	* register_framebuffer() sets it to index instead of mk_kdev(...)
	* users converted from minor(foo.node) to foo.node
	* useless assignments (typically to NODEV) removed - we never
look at that field before register_framebuffer() overwrites it and thus
any assignments prior to register_framebuffer() call are dead code.

diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 07863a5ee58b64a57fbc3fa2723c8729234917a6..455fda990ff70472a895cfb36b346a1d2fe181d6 100644 (file)
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -520,7 +520,6 @@ static void __init s3triofb_of_init(struct device_node *dp)
 
     strcpy(fb_info.modename, "Trio64 ");
     strncat(fb_info.modename, dp->full_name, sizeof(fb_info.modename));
-    fb_info.node = NODEV;
     fb_info.currcon = -1;
     fb_info.fbops = &s3trio_ops;
     fb_info.screen_base = s3trio_base; 
@@ -542,7 +541,7 @@ static void __init s3triofb_of_init(struct device_node *dp)
        return;
 
     printk("fb%d: S3 Trio frame buffer device on %s\n",
-          minor(fb_info.node), dp->full_name);
+          fb_info.node, dp->full_name);
 }
 
 

diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c
index 2ba5f133d48970767705de6e7280e8114a723058..4ae0cbfbc4e81cd1c8fa499fdd3f0460067451f7 100644 (file)
--- a/drivers/video/acornfb.c
+++ b/drivers/video/acornfb.c
@@ -979,7 +979,6 @@ static void __init acornfb_init_fbinfo(void)
                return;
        first = 0;
 
-       fb_info.node            = NODEV;
        fb_info.fbops           = &acornfb_ops;
        fb_info.flags           = FBINFO_FLAG_DEFAULT;
 

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index efcc855ee8c93076ef088cd58917174a875e236f..6eb80fd1a24d783429e63822fdc6c8146e2a59d2 100644 (file)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2385,7 +2385,6 @@ default_chipset:
            fb_info.monspecs.vfmax = 90;
        }
 
-       fb_info.node = NODEV;
        fb_info.fbops = &amifb_ops;
        fb_info.par = &currentpar;
        fb_info.flags = FBINFO_FLAG_DEFAULT;
@@ -2453,7 +2452,7 @@ default_chipset:
        }
 
        printk("fb%d: %s frame buffer device, using %dK of video memory\n",
-              minor(fb_info.node), fb_info.fix.id, fb_info.fix.smem_len>>10);
+              fb_info.node, fb_info.fix.id, fb_info.fix.smem_len>>10);
 
        return 0;
 

diff --git a/drivers/video/anakinfb.c b/drivers/video/anakinfb.c
index 90c47bb310a42d4ec01660c5e9827aac9f2252ce..e13c5654fee1302a01245643a9d3e8193969f453 100644 (file)
--- a/drivers/video/anakinfb.c
+++ b/drivers/video/anakinfb.c
@@ -73,7 +73,6 @@ anakinfb_init(void)
 {
        memset(&fb_info, 0, sizeof(struct fb_info));
 
-       fb_info.node = NODEV;
        fb_info.flags = FBINFO_FLAG_DEFAULT;
        fb_info.fbops = &anakinfb_ops;
        fb_info.var = anakinfb_var;

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index c4b05079141b1d484cb3dc7240e84334f2b0e150..b7d16c494a32e638ea3583c95c38f673ca336651 100644 (file)
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -2793,7 +2793,6 @@ int __init atafb_init(void)
 
        strcpy(fb_info.modename, "Atari Builtin ");
        fb_info.changevar = NULL;
-       fb_info.node = NODEV;
        fb_info.fbops = &atafb_ops;
        fb_info.disp = &disp;
        fb_info.currcon = -1;
@@ -2817,7 +2816,7 @@ int __init atafb_init(void)
           printk("   virtual %dx%d\n",
                          disp.var.xres_virtual, disp.var.yres_virtual);
        printk("fb%d: %s frame buffer device, using %dK of video memory\n",
-              minor(fb_info.node), fb_info.modename, screen_len>>10);
+              fb_info.node, fb_info.modename, screen_len>>10);
 
        /* TODO: This driver cannot be unloaded yet */
        MOD_INC_USE_COUNT;

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 7f3e242abeaf482609ac090482f23c8b3137b569..c0faa63297b23889f5b74ea7bfd04065c177a859 100644 (file)
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -1534,7 +1534,6 @@ aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
        par->chip_gen = ent->driver_data;
 
        /* fill in info */
-       info->node  = NODEV;
        info->fbops = &aty128fb_ops;
        info->flags = FBINFO_FLAG_DEFAULT;
 
@@ -1635,7 +1634,7 @@ aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
 #endif
 
        printk(KERN_INFO "fb%d: %s frame buffer device on %s\n",
-              minor(info->node), info->fix.id, video_card);
+              info->node, info->fix.id, video_card);
 
        return 1;       /* success! */
 }

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 42c068a984cefbabcd96f5a50fdae2b227660114..d936ea26fbb140d8b91b3d23c4940691cc7a423f 100644 (file)
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -1747,7 +1747,6 @@ static int __init aty_init(struct fb_info *info, const char *name)
        fb_memset((void *) info->screen_base, 0,
                  info->fix.smem_len);
 
-       info->node = NODEV;
        info->fbops = &atyfb_ops;
        info->pseudo_palette = pseudo_palette;
        info->flags = FBINFO_FLAG_DEFAULT;
@@ -1861,7 +1860,7 @@ static int __init aty_init(struct fb_info *info, const char *name)
        fb_list = info;
 
        printk("fb%d: %s frame buffer device on %s\n",
-              minor(info->node), info->fix.id, name);
+              info->node, info->fix.id, name);
        return 1;
 }
 

diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index e78d60770018a21092406d6ca11114faa149677b..0156e052094751971bd05bf13e8ac18ab6004083 100644 (file)
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -346,7 +346,6 @@ static void bw2_init_one(struct sbus_dev *sdev)
 
        all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &bw2_ops;
 #if defined(CONFIG_SPARC32)

diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 64338b288a4586c054f66ee549fe276bf6c28970..db67f321b18366ed7288475156984a36f47712c8 100644 (file)
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -473,7 +473,6 @@ static void cg14_init_one(struct sbus_dev *sdev, int node, int parent_node)
        all->par.mode = MDI_8_PIX;
        all->par.ramsize = (is_8mb ? 0x800000 : 0x400000);
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &cg14_ops;
        all->info.currcon = -1;

diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index cf2387e9a729c511e92fb7e8b095e13abc892301..82b15c380f0380ba745561a6509791a00eb47900 100644 (file)
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -395,7 +395,6 @@ static void cg3_init_one(struct sbus_dev *sdev)
                sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
                             sizeof(struct cg3_regs), "cg3 regs");
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &cg3_ops;
 #ifdef CONFIG_SPARC32

diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 6c12e74f7b0874119b3c2c008190dd192ba2a17a..b343355a13e1f46119b08e85388bbd62ddd43f9c 100644 (file)
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -680,7 +680,6 @@ static void cg6_init_one(struct sbus_dev *sdev)
                sbus_ioremap(&sdev->resource[0], CG6_FHC_OFFSET,
                             sizeof(u32), "cgsix fhc");
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &cg6_ops;
 #ifdef CONFIG_SPARC32

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index cd8bb196e904ace1fdf8eec50c4db0261e5c2e96..aaf9358e26de3885c2b1fd38ca08c90825b3e98f 100644 (file)
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -361,7 +361,6 @@ static void __init init_chips(struct fb_info *p, unsigned long addr)
 
        p->var = chipsfb_var;
 
-       p->node = NODEV;
        p->fbops = &chipsfb_ops;
        p->flags = FBINFO_FLAG_DEFAULT;
 
@@ -373,7 +372,7 @@ static void __init init_chips(struct fb_info *p, unsigned long addr)
        }
 
        printk(KERN_INFO "fb%d: Chips 65550 frame buffer (%dK RAM detected)\n",
-               minor(p->node), p->fix.smem_len / 1024);
+               p->node, p->fix.smem_len / 1024);
 
        chips_hw_init();
 }

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index a28cadee19e5ae4342d3c325abbe1c5ca9a55400..03fd97b544a7fc529dc93ae073aa03bde22e504a 100644 (file)
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2781,7 +2781,6 @@ int __init clgenfb_init(void)
                 sizeof (fb_info->gen.info.modename));
        fb_info->gen.info.modename [sizeof (fb_info->gen.info.modename) - 1] = 0;
 
-       fb_info->gen.info.node = NODEV;
        fb_info->gen.info.fbops = &clgenfb_ops;
        fb_info->gen.info.disp = &disp;
        fb_info->gen.info.currcon = -1;

diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index 280e1de029dd3f88e28a0b0ef4b5f5fab1611126..6cd228f485aa2069806daa989fa08bd7ece9cdab 100644 (file)
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -483,7 +483,7 @@ try_again:
        if (register_framebuffer(&p->info) < 0)
                return -ENXIO;
        
-       printk(KERN_INFO "fb%d: control display adapter\n", minor(p->info.node));       
+       printk(KERN_INFO "fb%d: control display adapter\n", p->info.node);      
 
        return 0;
 }
@@ -1008,7 +1008,6 @@ static void __init control_init_info(struct fb_info *info, struct fb_info_contro
 {
        /* Fill fb_info */
        info->par = &p->par;
-       info->node = NODEV;
        info->fbops = &controlfb_ops;
        info->pseudo_palette = p->pseudo_palette;
         info->flags = FBINFO_FLAG_DEFAULT;

diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 9f9b037cc66d77495882a0e43a73f155bf701610..89ca4cd5424a8132506e094be25a388f07efe1de 100644 (file)
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1281,7 +1281,6 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
 
        cfb->fb.fbops           = &cyber2000fb_ops;
        cfb->fb.flags           = FBINFO_FLAG_DEFAULT;
-       cfb->fb.node            = NODEV;
        cfb->fb.pseudo_palette  = (void *)(cfb + 1);
 
        fb_alloc_cmap(&cfb->fb.cmap, NR_PALETTE, 0);

diff --git a/drivers/video/cyberfb.c b/drivers/video/cyberfb.c
index 79c11de10abfe4c88bcb0f4913382a745cd9f69a..45bbd37c093bec999e751821e11271407bad48a3 100644 (file)
--- a/drivers/video/cyberfb.c
+++ b/drivers/video/cyberfb.c
@@ -1033,7 +1033,6 @@ int __init cyberfb_init(void)
 
            strcpy(fb_info.modename, cyberfb_name);
            fb_info.changevar = NULL;
-           fb_info.node = NODEV;
            fb_info.fbops = &cyberfb_ops;
            fb_info.screen_base = (unsigned char *)CyberMem;
            fb_info.disp = &disp;
@@ -1063,7 +1062,7 @@ int __init cyberfb_init(void)
            }
 
            printk("fb%d: %s frame buffer device, using %ldK of video memory\n",
-                  minor(fb_info.node), fb_info.modename, CyberSize>>10);
+                  fb_info.node, fb_info.modename, CyberSize>>10);
 
            /* TODO: This driver cannot be unloaded yet */
            MOD_INC_USE_COUNT;

diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index c6bac98371b75133e3a4eab36b48d8a47fccf22d..914bc8e388ecea5954895a6f153f7be8ab6c1336 100644 (file)
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -229,7 +229,6 @@ unsigned long __init dnfb_init(unsigned long mem_start)
 {
        int err;
 
-       fb_info.node = NODEV;
        fb_info.fbops = &dn_fb_ops;
        fb_info.fix = dnfb_fix;
        fb_info.var = dnfb_var;

diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c
index 8fa3c2b6e88ddf382dbf1e816781ae5061c4c074..a998ee9d8d68e7299126e96da2663c69941f6be8 100644 (file)
--- a/drivers/video/epson1355fb.c
+++ b/drivers/video/epson1355fb.c
@@ -500,7 +500,6 @@ int __init e1355fb_init(void)
        fb_info.gen.fbhw->detect();
        strcpy(fb_info.gen.info.modename, "SED1355");
        fb_info.gen.info.changevar = NULL;
-       fb_info.gen.info.node = NODEV;
        fb_info.gen.info.fbops = &e1355fb_ops;
        fb_info.gen.info.screen_base = (void *)E1355_FB_BASE;
        fb_info.gen.currcon = -1;
@@ -517,7 +516,7 @@ int __init e1355fb_init(void)
                do_install_cmap(0, &fb_info.gen);
        if (register_framebuffer(&fb_info.gen.info) < 0)
                return -EINVAL;
-       printk(KERN_INFO "fb%d: %s frame buffer device\n", minor(fb_info.gen.info.node),
+       printk(KERN_INFO "fb%d: %s frame buffer device\n", fb_info.gen.info.node,
               fb_info.gen.info.modename);
 
        return 0;

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 75b47be36f2212b4049205fe41458682811942e1..3e57dd0018ffd2ce56d6d42e69d61c812a8b67fe 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -753,7 +753,7 @@ static int fbmem_read_proc(char *buf, char **start, off_t offset,
        for (fi = registered_fb; fi < &registered_fb[FB_MAX] && len < 4000; fi++)
                if (*fi)
                        clen += sprintf(buf + clen, "%d %s\n",
-                                       minor((*fi)->node),
+                                       (*fi)->node,
                                        (*fi)->fix.id);
        *start = buf + offset;
        if (clen > offset)
@@ -1223,7 +1223,7 @@ register_framebuffer(struct fb_info *fb_info)
        for (i = 0 ; i < FB_MAX; i++)
                if (!registered_fb[i])
                        break;
-       fb_info->node = mk_kdev(FB_MAJOR, i);
+       fb_info->node = i;
        
        if (fb_info->pixmap.addr == NULL) {
                fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
@@ -1265,7 +1265,7 @@ unregister_framebuffer(struct fb_info *fb_info)
 {
        int i;
 
-       i = minor(fb_info->node);
+       i = fb_info->node;
        if (!registered_fb[i])
                return -EINVAL;
        devfs_remove("fb/%d", i);

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index f72f90905e809c513f4e5490b2864bbd872bd7c4..5e0ac99bfd2d6e7ce4dd7971284abd75a45f89c0 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -895,7 +895,6 @@ static void ffb_init_one(int node, int parent)
        all->par.prom_node = node;
        all->par.prom_parent_node = parent;
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &ffb_ops;
        all->info.screen_base = (char *) all->par.physbase + FFB_DFB24_POFF;

diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index de2ba42e4f3116255341311f7a5c14bf02e2f648..b4e2da8d665370320b69767c6916ef762f527324 100644 (file)
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -259,7 +259,6 @@ int __init fm2fb_init(void)
                if (fm2fb_mode == -1)
                        fm2fb_mode = FM2FB_MODE_PAL;
 
-               fb_info.node = NODEV;
                fb_info.fbops = &fm2fb_ops;
                fb_info.var = fb_var_modes[fm2fb_mode];
                fb_info.screen_base = (char *)fb_fix.smem_start;
@@ -273,7 +272,7 @@ int __init fm2fb_init(void)
                if (register_framebuffer(&fb_info) < 0)
                        return -EINVAL;
 
-               printk("fb%d: %s frame buffer device\n", minor(fb_info.node), fb_fix.id);
+               printk("fb%d: %s frame buffer device\n", fb_info.node, fb_fix.id);
                return 0;
        }
        return -ENXIO;

diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index 2e37b7d58852585040df6890917ba79a6cadc8e7..a869bf147f7409f61349792a638ab5f729fede9c 100644 (file)
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -237,7 +237,6 @@ int __init g364fb_init(void)
        fb_fix.smem_len = (1 << (mem * 2)) * 512 * 1024;
        fb_var.yres_virtual = fb_fix.smem_len / fb_var.xres;
 
-       fb_info.node = NODEV;
        fb_info.fbops = &g364fb_ops;
        fb_info.screen_base = (char *) G364_MEM_BASE;   /* virtual kernel address */
        fb_info.var = fb_var;

diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index 12ce8dfc6a8f6e89c387f95c6e3842149725617f..79e5e860ab3a1a5135fdd3e32b3fd4bdb50e2f0a 100644 (file)
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -549,7 +549,6 @@ int __init hgafb_init(void)
        hga_fix.smem_start = VGA_MAP_MEM(hga_vram_base);
        hga_fix.smem_len = hga_vram_len;
 
-       fb_info.node = NODEV;
        fb_info.flags = FBINFO_FLAG_DEFAULT;
        fb_info.var = hga_default_var;
        fb_info.fix = hga_fix;
@@ -565,7 +564,7 @@ int __init hgafb_init(void)
                 return -EINVAL;
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
-               minor(fb_info.node), fb_info.fix.id);
+               fb_info.node, fb_info.fix.id);
        return 0;
 }
 

diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 19dadead964b6fb100d79f78fe2e639a1dfdd9cd..3de65cec9e962b0c291622115cdd3f22ac69c32d 100644 (file)
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -153,7 +153,6 @@ int __init hitfb_init(void)
        }
        hitfb_var.yres = ldvntr+1;
 
-       fb_info.node            = NODEV;
        fb_info.fbops           = &hitfb_ops;
        fb_info.var             = hitfb_var;
        fb_info.fix             = hitfb_fix;
@@ -169,7 +168,7 @@ int __init hitfb_init(void)
                return -EINVAL;
     
        printk(KERN_INFO "fb%d: %s frame buffer device\n",
-                       minor(fb_info.node), fb_info.fix.id);
+                       fb_info.node, fb_info.fix.id);
        return 0;
 }
 

diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 0495c4423454a75b9d8b851155be68d7c4a45efe..bfbdbabfd18833f899e126d54c71a7cc034fc68f 100644 (file)
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -150,7 +150,6 @@ int __init hpfb_init_one(unsigned long base)
        /*
         *      Let there be consoles..
         */
-       fb_info.node  = NODEV;
        fb_info.fbops = &hpfb_ops;
        fb_info.flags = FBINFO_FLAG_DEFAULT;
        fb_info.var   = hpfb_defined;

diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 97ed0193a954135e58c33fcb77ee0a822f9640f9..209ae54325d5f2cd01e1f90cf6e765d53dabf8f9 100644 (file)
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1828,7 +1828,6 @@ static int __init i810fb_init_pci (struct pci_dev *dev,
        i810_init_device(par);        
 
        info->screen_base = par->fb.virtual;
-       info->node = NODEV;
        info->fbops = &par->i810fb_ops;
        info->pseudo_palette = par->pseudo_palette;
        info->flags = FBINFO_FLAG_DEFAULT;
@@ -1861,7 +1860,7 @@ static int __init i810fb_init_pci (struct pci_dev *dev,
               "I810FB: Video RAM   : %dK\n" 
               "I810FB: Monitor     : H: %d-%d KHz V: %d-%d Hz\n"
               "I810FB: Mode        : %dx%d-%dbpp@%dHz\n",
-              minor(info->node),
+              info->node,
               i810_pci_list[entry->driver_data],
               VERSION_MAJOR, VERSION_MINOR, VERSION_TEENIE, BRANCH_VERSION,
               (int) par->fb.size>>10, info->monspecs.hfmin/1000,

diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 4102c3fac1e31ceeedbf26e2fc8202d78f1969c5..bf7084bda436a37b460e80aaf0a17c9f21097f9a 100644 (file)
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -356,7 +356,6 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
         else 
                 video_cmap_len = 256;
 
-       info->node  = NODEV;
        info->fbops = &igafb_ops;
        info->flags = FBINFO_FLAG_DEFAULT;
 
@@ -366,7 +365,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
                return 0;
 
        printk("fb%d: %s frame buffer device at 0x%08lx [%dMB VRAM]\n",
-              minor(info->node), info->fix.id, 
+              info->node, info->fix.id, 
               par->frame_buffer_phys, info->fix.smem_len >> 20);
 
        iga_blank_border(par); 

diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index a50ac950323076dae2c0b620eca1cd4c6bfc5e93..b73978910d0e893d93e0025ba9d009adbee535b1 100644 (file)
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1440,7 +1440,6 @@ init_imstt(struct fb_info *info)
 
        info->var.pixclock = 1000000 / getclkMHz(par);
 
-       info->node = NODEV;
        info->fbops = &imsttfb_ops;
        info->flags = FBINFO_FLAG_DEFAULT;
 
@@ -1453,7 +1452,7 @@ init_imstt(struct fb_info *info)
 
        tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
        printk("fb%u: %s frame buffer; %uMB vram; chip version %u\n",
-               minor(info->node), info->fix.id, info->fix.smem_len >> 20, tmp);
+               info->node, info->fix.id, info->fix.smem_len >> 20, tmp);
 }
 
 static int __devinit

diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index fdef64187e843a6905c73a0ff8308f3415913404..f18c3c4fd81bd8e363722fcf3aacd9180689cc30 100644 (file)
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -510,7 +510,6 @@ static void leo_init_one(struct sbus_dev *sdev)
                sbus_ioremap(&sdev->resource[0], LEO_OFF_LX_CURSOR,
                             sizeof(struct leo_cursor), "leolx cursor");
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &leo_ops;
        all->info.currcon = -1;

diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 12d5e7710b379de17cd09feb680ae6e8a272a1c7..c1cfaa7ef1f37110aea30040fc143daeec1394bb 100644 (file)
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -943,7 +943,6 @@ void __init macfb_init(void)
                        break;
                }
 
-       fb_info.node            = NODEV;
        fb_info.fbops           = &macfb_ops;
        fb_info.var             = macfb_defined;
        fb_info.fix             = macfb_fix;
@@ -956,7 +955,7 @@ void __init macfb_init(void)
                return;
 
        printk("fb%d: %s frame buffer device\n",
-              minor(fb_info.node), fb_info.fix.id);
+              fb_info.node, fb_info.fix.id);
 }
 
 MODULE_LICENSE("GPL");

diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 8bf4d3e44c084dbc8d8139ed0d2c04dad364f77c..0bc575b0a254e9b568c55968bcb42777ad7946ab 100644 (file)
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -112,7 +112,7 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
        b->mask.clock = clock;
        b->adapter = matrox_i2c_adapter_template;
        snprintf(b->adapter.dev.name, DEVICE_NAME_SIZE, name,
-               minor(minfo->fbcon.node));
+               minfo->fbcon.node);
        b->adapter.data = b;
        b->adapter.algo_data = &b->bac;
        b->bac = matrox_i2c_algo_template;

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 3a988123e6542a5803ed9c7a3d3aa56f16b26d55..aa5a1b909415e0ce0e38ec1e9d246bae031d992b 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1752,7 +1752,6 @@ static int initMatrox2(WPMINFO struct display* d, struct board* b){
 
        strcpy(ACCESS_FBINFO(fbcon.modename), "MATROX VGA");
        ACCESS_FBINFO(fbcon.changevar) = NULL;
-       ACCESS_FBINFO(fbcon.node) = NODEV;
        ACCESS_FBINFO(fbcon.fbops) = &matroxfb_ops;
        ACCESS_FBINFO(fbcon.disp) = d;
        ACCESS_FBINFO(fbcon.switch_con) = &matroxfb_switch;
@@ -1872,12 +1871,12 @@ static int initMatrox2(WPMINFO struct display* d, struct board* b){
                goto failVideoIO;
        }
        printk("fb%d: %s frame buffer device\n",
-              minor(ACCESS_FBINFO(fbcon.node)), ACCESS_FBINFO(fbcon.modename));
+              ACCESS_FBINFO(fbcon.node), ACCESS_FBINFO(fbcon.modename));
        if (ACCESS_FBINFO(fbcon.currcon) < 0) {
                /* there is no console on this fb... but we have to initialize hardware
                 * until someone tells me what is proper thing to do */
                printk(KERN_INFO "fb%d: initializing hardware\n",
-                       minor(ACCESS_FBINFO(fbcon.node)));
+                       ACCESS_FBINFO(fbcon.node));
                matroxfb_set_var(&vesafb_defined, -1, &ACCESS_FBINFO(fbcon));
        }
        return 0;

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 70a63cb5f097d3a2141c67b06bbaa0f459eb36c8..7686cc303191e3b563cf947cd5d9bb419978c837 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -747,7 +747,6 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
 
        strcpy(m2info->fbcon.modename, "MATROX CRTC2");
        m2info->fbcon.changevar = NULL;
-       m2info->fbcon.node = NODEV;
        m2info->fbcon.fbops = &matroxfb_dh_ops;
        m2info->fbcon.disp = d;
        m2info->fbcon.switch_con = &matroxfb_dh_switch;
@@ -816,7 +815,7 @@ static int matroxfb_dh_registerfb(struct matroxfb_dh_fb_info* m2info) {
                return -1;
        }
        printk(KERN_INFO "matroxfb_crtc2: secondary head of fb%u was registered as fb%u\n",
-               minor(ACCESS_FBINFO(fbcon.node)), minor(m2info->fbcon.node));
+               ACCESS_FBINFO(fbcon.node), m2info->fbcon.node);
        m2info->fbcon_registered = 1;
        return 0;
 #undef minfo
@@ -839,7 +838,7 @@ static void matroxfb_dh_deregisterfb(struct matroxfb_dh_fb_info* m2info) {
                        printk(KERN_ERR "matroxfb_crtc2: Expect kernel crash after module unload.\n");
                        return;
                }
-               id = minor(m2info->fbcon.node);
+               id = m2info->fbcon.node;
                unregister_framebuffer(&m2info->fbcon);
                kfree(m2info->fbcon.disp);
                /* return memory back to primary head */

diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c
index 402a8a26865a7128255dba46a1b3eaf2d4642cbb..572ed2269a6c3e1d7bde08f3e4449fb2370e8a78 100644 (file)
--- a/drivers/video/maxinefb.c
+++ b/drivers/video/maxinefb.c
@@ -155,7 +155,6 @@ int __init maxinefb_init(void)
                 */
        }
 
-       fb_info.node = NODEV;
        fb_info.fbops = &maxinefb_ops;
        fb_info.screen_base = (char *) maxinefb_fix.smem_start;
        fb_info.var = maxinefb_defined;

diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 3a784fb4f77bbee94be993b06a20049df79a25b5..d089e9dc04d8eaafcca34b9f105ed533a3fb9c57 100644 (file)
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -2021,7 +2021,7 @@ static int __devinit neofb_probe(struct pci_dev *dev,
                goto failed;
 
        printk(KERN_INFO "fb%d: %s frame buffer device\n",
-              minor(info->node), info->fix.id);
+              info->node, info->fix.id);
 
        /*
         * Our driver data

diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 57ecfbeb7471701de7e89f1f10a2a650b3a9da3a..5c1af5f6cc6f4c379a774e03c6934d95d5d2da8f 100644 (file)
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -523,7 +523,6 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        var->sync = 0;
        var->vmode = FB_VMODE_NONINTERLACED;
 
-       info->node = NODEV;
        info->fbops = &offb_ops;
        info->screen_base = ioremap(address, fix->smem_len);
        info->par = par;
@@ -539,7 +538,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
        }
 
        printk(KERN_INFO "fb%d: Open Firmware frame buffer device on %s\n",
-              minor(info->node), full_name);
+              info->node, full_name);
 }
 
 MODULE_LICENSE("GPL");

diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 371a117276c46de8411b21c15b14f700ef85f9ad..f6eeecfd7b7d8372ad4b16fecffb68657b2376ac 100644 (file)
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -298,7 +298,6 @@ static void p9100_init_one(struct sbus_dev *sdev)
                sbus_ioremap(&sdev->resource[0], 0,
                             sizeof(struct p9100_regs), "p9100 regs");
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &p9100_ops;
 #ifdef CONFIG_SPARC32

diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 2b234aad65007b0e922a4819d208308f0d9e9b5d..8f2de2df5ff65f1abbc71f515c38cb4fd3a4126e 100644 (file)
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -327,7 +327,6 @@ static void __init platinum_init_info(struct fb_info *info, struct fb_info_plati
 {
        /* Fill fb_info */
        info->par = &p->par;
-       info->node = NODEV;
        info->fbops = &platinumfb_ops;
        info->pseudo_palette = p->pseudo_palette;
         info->flags = FBINFO_FLAG_DEFAULT;
@@ -409,7 +408,7 @@ try_again:
                return 0;
 
        printk(KERN_INFO "fb%d: platinum frame buffer device\n",
-              minor(p->info.node));
+              p->info.node);
 
        return 1;
 }

diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 6ba00ba4f07853a11d343da4f0a11f41163d9015..2ae3a177280ebb1d47982881d8e80940e59af714 100644 (file)
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -2269,7 +2269,6 @@ int __init pm2fb_init(void) {
        fb_info.gen.parsize=sizeof(struct pm2fb_par);
        fb_info.gen.fbhw=&pm2fb_hwswitch;
        strcpy(fb_info.gen.info.modename, permedia2_name);
-       fb_info.gen.info.node = NODEV;
        fb_info.gen.info.flags=FBINFO_FLAG_DEFAULT;
        fb_info.gen.info.fbops=&pm2fb_ops;
        fb_info.gen.info.disp=&fb_info.disp;
@@ -2288,7 +2287,7 @@ int __init pm2fb_init(void) {
                return -EINVAL;
        }
        printk(KERN_INFO "fb%d: %s (%s), using %uK of video memory.\n",
-                               minor(fb_info.gen.info.node),
+                               fb_info.gen.info.node,
                                board_table[fb_info.board].name,
                                permedia2_name,
                                (u32 )(fb_info.regions.fb_size>>10));

diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 5f18e89e32765141c328e4bc65385c51fbcad3e2..5c101faf77c988c1d4ed873e089a14a3a9696bb4 100644 (file)
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -1602,7 +1602,6 @@ static void pm3fb_common_init(struct pm3fb_info *l_fb_info)
        disp[l_fb_info->board_num].scrollmode = 0;      /* SCROLL_YNOMOVE; *//* 0 means "let fbcon choose" */
        l_fb_info->gen.parsize = sizeof(struct pm3fb_par);
        l_fb_info->gen.info.changevar = NULL;
-       l_fb_info->gen.info.node = B_FREE;
        l_fb_info->gen.info.fbops = &pm3fb_ops;
        l_fb_info->gen.info.disp = &(disp[l_fb_info->board_num]);
        if (fontn[l_fb_info->board_num][0])
@@ -1646,7 +1645,7 @@ static void pm3fb_common_init(struct pm3fb_info *l_fb_info)
        pm3fb_write_mode(l_fb_info);
        
        printk("fb%d: %s, using %uK of video memory (%s)\n",
-              minor(l_fb_info->gen.info.node),
+              l_fb_info->gen.info.node,
               permedia3_name, (u32) (l_fb_info->fb_size >> 10),
               cardbase[l_fb_info->board_type].cardname);
 }

diff --git a/drivers/video/pmag-ba-fb.c b/drivers/video/pmag-ba-fb.c
index 343a7a46ecbc6a509d49bd4ad7b4a644ee2fa000..45e3265734410da29352e36d71b16ae64585eda3 100644 (file)
--- a/drivers/video/pmag-ba-fb.c
+++ b/drivers/video/pmag-ba-fb.c
@@ -138,7 +138,6 @@ int __init pmagbafb_init_one(int slot)
        /*
         *      Let there be consoles..
         */
-       info->node = NODEV;
        info->fbops = &pmagbafb_ops;
        info->var = pmagbafb_defined;
        info->fix = pmagbafb_fix; 

diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c
index aa57a478f79f306b44b08b3193932f2989966e55..16847d8d8776b87d5b03936c3847618ce113eb73 100644 (file)
--- a/drivers/video/pmagb-b-fb.c
+++ b/drivers/video/pmagb-b-fb.c
@@ -141,7 +141,6 @@ int __init pmagbbfb_init_one(int slot)
        /*
         *      Let there be consoles..
         */
-       info->node = NODEV;
        info->fbops = &pmagbbfb_ops;
        info->var = pmagbbfb_defined;
        info->fix = pmagbbfb_fix;

diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 00a4eab71603df3ab9d4646e0bb73b3c3a53fe16..518727c413e602694a049be93ea568e07a77e29f 100644 (file)
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -1021,7 +1021,6 @@ int __init pvr2fb_init(void)
        
        strcpy(fb_info.modename, pvr2fb_name);
        fb_info.changevar = NULL;
-       fb_info.node = NODEV;
        fb_info.fbops = &pvr2fb_ops;
        fb_info.screen_base = (char *) videomemory;
        fb_info.disp = &disp;
@@ -1060,10 +1059,10 @@ int __init pvr2fb_init(void)
        modememused = get_line_length(var.xres_virtual, var.bits_per_pixel);
        modememused *= var.yres_virtual;
        printk("fb%d: %s frame buffer device, using %ldk/%ldk of video memory\n",
-              minor(fb_info.node), fb_info.modename, modememused>>10,
+              fb_info.node, fb_info.modename, modememused>>10,
               videomemorysize>>10);
        printk("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", 
-              minor(fb_info.node), var.xres, var.yres, var.bits_per_pixel, 
+              fb_info.node, var.xres, var.yres, var.bits_per_pixel, 
               get_line_length(var.xres, var.bits_per_pixel),
               (char *)pvr2_get_param(cables, NULL, cable_type, 3),
               (char *)pvr2_get_param(outputs, NULL, video_output, 3));

diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c
index 88d88b03e7644ba785d2e4a1a887ee47432742d1..58c2254f89bb0304ac029f04915ecea4036e7d0e 100644 (file)
--- a/drivers/video/q40fb.c
+++ b/drivers/video/q40fb.c
@@ -105,7 +105,6 @@ int q40fb_init(void)
        
        fb_info.var = q40fb_var;
        fb_info.fix = q40fb_fix;
-       fb_info.node = NODEV;
        fb_info.fbops = &q40fb_ops;
        fb_info.flags = FBINFO_FLAG_DEFAULT;  /* not as module for now */
        fb_info.pseudo_palette = pseudo_palette;        
@@ -121,7 +120,7 @@ int q40fb_init(void)
        }
 
         printk(KERN_INFO "fb%d: Q40 frame buffer alive and kicking !\n",
-              minor(fb_info.node));
+              fb_info.node);
        return 0;
 }
 

diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index d80b50310a777237051e8f44fd65d80a1764dc82..e7c027d4c8caace7df8516c5f4e9aca7b764b92a 100644 (file)
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -2237,7 +2237,6 @@ static int __devinit radeon_set_fbinfo (struct radeonfb_info *rinfo)
        info->currcon = -1;
        info->par = rinfo;
        info->pseudo_palette = rinfo->pseudo_palette;
-        info->node = NODEV;
         info->flags = FBINFO_FLAG_DEFAULT;
         info->fbops = &radeonfb_ops;
         info->display_fg = NULL;

diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index 234ad307def124470b30ba9cdbf3767df8efdd14..9167e229e352829927520f3bc97b53dcd2d01291 100644 (file)
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -1403,7 +1403,6 @@ int __init retz3fb_init(void)
 
                strcpy(fb_info->modename, retz3fb_name);
                fb_info->changevar = NULL;
-               fb_info->node = NODEV;
                fb_info->fbops = &retz3fb_ops;
                fb_info->screen_base = zinfo->fbmem;
                fb_info->disp = &zinfo->disp;
@@ -1430,7 +1429,7 @@ int __init retz3fb_init(void)
                        return -EINVAL;
 
                printk(KERN_INFO "fb%d: %s frame buffer device, using %ldK of "
-                      "video memory\n", minor(fb_info->node),
+                      "video memory\n", fb_info->node,
                       fb_info->modename, zinfo->fbsize>>10);
 
                /* FIXME: This driver cannot be unloaded yet */

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 7ea698b2cdccca1f6c38e7a5467a22d07979d365..e3acf6ee83a2398ea2d2c684b60d0c3c0620df55 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1581,7 +1581,6 @@ static int __init riva_set_fbinfo(struct fb_info *info)
        struct riva_par *par = (struct riva_par *) info->par;
        unsigned int cmap_len;
 
-       info->node = NODEV;
        info->flags = FBINFO_FLAG_DEFAULT;
        info->var = rivafb_default_var;
        info->fix = rivafb_fix;

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 884d16686b7e331a64f82cd4002e370792b31eb5..c0ca4d0807d2a4e0a746ecc30cc864061e756cce 100644 (file)
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1701,7 +1701,6 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(void)
 
        fbi->fb.fbops           = &sa1100fb_ops;
        fbi->fb.flags           = FBINFO_FLAG_DEFAULT;
-       fbi->fb.node            = NODEV;
        fbi->fb.monspecs        = monspecs;
        fbi->fb.currcon         = -1;
        fbi->fb.pseudo_palette  = (fbi + 1);

diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index c85269a46e77412093981c58298d291b34d1e785..136c9d8e5546a4db718ba5c96940b6cc3e6459c4 100644 (file)
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -773,7 +773,6 @@ int __init sgivwfb_init(void)
        sgivwfb_fix.ywrapstep = ywrap;
        sgivwfb_fix.ypanstep = ypan;
 
-       fb_info.node = NODEV;
        fb_info.fix = sgivwfb_fix;
 
        switch (flatpanel_id) {
@@ -807,7 +806,7 @@ int __init sgivwfb_init(void)
        }
 
        printk(KERN_INFO "fb%d: SGI DBE frame buffer device, using %ldK of video memory at %#lx\n",      
-               minor(fb_info.node), sgivwfb_mem_size >> 10, sgivwfb_mem_phys);
+               fb_info.node, sgivwfb_mem_size >> 10, sgivwfb_mem_phys);
        return 0;
 
 fail_register_framebuffer:

diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 20881ffefa38a6ce690f591e29caa5b8ef16fcc9..72e953be4c59ab57626eec1e98f60fb2ff9329b1 100644 (file)
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -4524,7 +4524,6 @@ int __init sisfb_init(void)
 #endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)                /* ---- 2.5 series init ---- */
-               sis_fb_info.node = NODEV;
                sis_fb_info.flags = FBINFO_FLAG_DEFAULT;
                sis_fb_info.var = default_var;
                sis_fb_info.fix = sisfb_fix;
@@ -4571,7 +4570,7 @@ int __init sisfb_init(void)
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
                printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%02d\n",
-                       minor(sis_fb_info.node), myid, VER_MAJOR, VER_MINOR, VER_LEVEL);                             
+                       sis_fb_info.node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);                            
 #endif
 
        }       /* TW: if mode = "none" */

diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index 32828b5ac9e23308cc7fffb829fcb65dba686495..947ddfb840c82cc50f458f3eb35fe86447cd08c4 100644 (file)
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -536,7 +536,6 @@ int __init xxxfb_init(void)
      * space via ioremap. Consult ioport.h. 
      */
     info.screen_base = framebuffer_virtual_memory;     
-    info.node = NODEV;
     info.fbops = &xxxfb_ops;
     info.fix = xxxfb_fix;
     info.pseudo_palette = pseudo_palette;
@@ -566,7 +565,7 @@ int __init xxxfb_init(void)
        
     if (register_framebuffer(&info) < 0)
        return -EINVAL;
-    printk(KERN_INFO "fb%d: %s frame buffer device\n", minor(info.node),
+    printk(KERN_INFO "fb%d: %s frame buffer device\n", info.node,
           info.fix.id);
     return 0;
 }

diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c
index 0f8d1315760ec2d9269d5e0b9926ee3cdead3614..c5619452c70b62fd10699ed6d2df3f33a92cbcc3 100644 (file)
--- a/drivers/video/sstfb.c
+++ b/drivers/video/sstfb.c
@@ -1474,7 +1474,6 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
        f_ddprintk("membase_phys: %#lx\n", fix->smem_start);
        f_ddprintk("fbbase_virt: %p\n", info->screen_base);
 
-       info->node      = NODEV;
        info->flags     = FBINFO_FLAG_DEFAULT;
        info->fbops     = &sstfb_ops;
        info->currcon   = -1;
@@ -1520,7 +1519,7 @@ static int __devinit sstfb_probe(struct pci_dev *pdev,
                sstfb_drawdebugimage(info);
 
        printk(KERN_INFO "fb%d: %s frame buffer device at 0x%p\n",
-              minor(info->node), fix->id, info->screen_base);
+              info->node, fix->id, info->screen_base);
 
        return 0;
 

diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 26cefafca4297a3fe970ddb8d435e4c19ec50f43..5a97db3c70c93aa39052bf54275f4a3fe7af29c7 100644 (file)
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -1277,7 +1277,6 @@ stifb_init_fb(struct sti_struct *sti, int force_bpp)
        var->bits_per_pixel = bpp;
 
        strcpy(fix->id, "stifb");
-       info->node = NODEV;
        info->fbops = &stifb_ops;
        info->screen_base = (void*) REGION_BASE(fb,1);
        info->flags = FBINFO_FLAG_DEFAULT;
@@ -1306,7 +1305,7 @@ stifb_init_fb(struct sti_struct *sti, int force_bpp)
 
        printk(KERN_INFO 
            "fb%d: %s %dx%d-%d frame buffer device, id: %04x, mmio: 0x%04lx\n",
-               minor(fb->info.node), 
+               fb->info.node, 
                fix->id,
                var->xres, 
                var->yres,

diff --git a/drivers/video/sun3fb.c b/drivers/video/sun3fb.c
index 57b37fa4084ba3a89854f1751eb647db2ec644c9..bfed02b7aa2934de0d2d9d93988732ea7a51c3b0 100644 (file)
--- a/drivers/video/sun3fb.c
+++ b/drivers/video/sun3fb.c
@@ -569,7 +569,6 @@ sizechange:
        fix->type = FB_TYPE_PACKED_PIXELS;
        fix->visual = FB_VISUAL_PSEUDOCOLOR;
        
-       fb->info.node = NODEV;
        fb->info.fbops = &sun3fb_ops;
        fb->info.disp = disp;
        fb->info.currcon = -1;
@@ -646,7 +645,7 @@ sizechange:
                kfree(fb);
                return -EINVAL;
        }
-       printk("fb%d: %s\n", minor(fb->info.node), p);
+       printk("fb%d: %s\n", fb->info.node, p);
 
        return 0;
 }

diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index be36ec6111b0007ada8eefa8899dd74fc82bd2f4..954abaa9f953afb26a3fa2e3943b08dc9c79c5af 100644 (file)
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -374,7 +374,6 @@ static void tcx_init_one(struct sbus_dev *sdev)
                all->par.mmap_map[i].poff = sdev->reg_addrs[j].phys_addr;
        }
 
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &tcx_ops;
 #ifdef CONFIG_SPARC32

diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 91f64663abcf96bcfbb9e5989eee1c0dfd53047a..a24e45bc84147f3abc17115de30a36aa7bfef615 100644 (file)
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -1218,7 +1218,6 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
        tdfx_fix.ypanstep       = nopan ? 0 : 1;
        tdfx_fix.ywrapstep      = nowrap ? 0 : 1;
    
-       info->node              = NODEV;
        info->fbops             = &tdfxfb_ops;
        info->fix               = tdfx_fix;     
        info->par               = default_par;

diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 009d3ddb4804e3e9925c506e656221ece2d592ff..fe861acde17f8958425043153acc6824a18b679a 100644 (file)
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -1425,7 +1425,6 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
        pci_read_config_byte(pdev, PCI_REVISION_ID, &all->par.tga_chip_rev);
 
        /* Setup framebuffer.  */
-       all->info.node = NODEV;
        all->info.flags = FBINFO_FLAG_DEFAULT;
        all->info.fbops = &tgafb_ops;
        all->info.screen_base = (char *) all->par.tga_fb_base;
@@ -1465,7 +1464,7 @@ tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
               pdev->bus->number, PCI_SLOT(pdev->devfn),
               PCI_FUNC(pdev->devfn));
        printk(KERN_INFO "fb%d: %s frame buffer device at 0x%lx\n",
-              minor(all->info.node), all->info.fix.id, bar0_start);
+              all->info.node, all->info.fix.id, bar0_start);
 
        return 0;
 

diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 8b5448659a9f0874857d535dfa351ebb298d4070..d6b589e10174a7e561e30547d4bffec93ba1c432 100644 (file)
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1140,7 +1140,6 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
                nativex = get_nativex();
 
        fb_info.fix = tridentfb_fix;
-       fb_info.node = NODEV;
        fb_info.fbops = &tridentfb_ops;
 
 
@@ -1161,7 +1160,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
                return -EINVAL;
        }
        output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
-          minor(fb_info.node), fb_info.fix.id,default_var.xres,
+          fb_info.node, fb_info.fix.id,default_var.xres,
           default_var.yres,default_var.bits_per_pixel);
        return 0;
 }

diff --git a/drivers/video/tx3912fb.c b/drivers/video/tx3912fb.c
index bcdf2e61f2404c9ea378e32a819b8c022f21c855..f060c0ac3f89f69aaf17d86f51e6561c1371cbfc 100644 (file)
--- a/drivers/video/tx3912fb.c
+++ b/drivers/video/tx3912fb.c
@@ -292,7 +292,6 @@ int __init tx3912fb_init(void)
        if ((tx3912fb_fix.line_length * tx3912fb_var.yres_virtual) > tx3912fb_fix.smem_len)
                return -ENOMEM;
 
-       fb_info.node = NODEV;
        fb_info.fbops = &tx3912fb_ops;
        fb_info.var = tx3912fb_var;
        fb_info.fix = tx3912fb_fix;
@@ -309,7 +308,7 @@ int __init tx3912fb_init(void)
                return -1;
 
        printk(KERN_INFO "fb%d: TX3912 frame buffer using %uKB.\n",
-              minor(fb_info.node), (u_int) (fb_info.fix.smem_len >> 10));
+              fb_info.node, (u_int) (fb_info.fix.smem_len >> 10));
        return 0;
 }
 

diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index e447ab48969d91b344b6d2933c3bfbfdac2f1f01..f9549caca411d0fa0a6359e0ea8ffea034010f44 100644 (file)
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -447,7 +447,7 @@ static void __init init_valkyrie(struct fb_info_valkyrie *p)
                return;
        }
        
-       printk(KERN_INFO "fb%d: valkyrie frame buffer device\n", GET_FB_IDX(p->info.node));     
+       printk(KERN_INFO "fb%d: valkyrie frame buffer device\n", p->info.node); 
 }
 
 static void valkyrie_set_par(const struct fb_par_valkyrie *par,
@@ -715,7 +715,6 @@ static void valkyrie_par_to_display(struct fb_par_valkyrie *par,
 static void __init valkyrie_init_info(struct fb_info *info, struct fb_info_valkyrie *p)
 {
        strcpy(info->modename, p->fix.id);
-       info->node = NODEV;
        info->fbops = &valkyriefb_ops;
        info->screen_base = (char *) p->frame_buffer + 0x1000;
        info->disp = &p->disp;

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 1f70b15405ece4751900fcdbc42bf52fd0b580ea..0dcba0980781b41ce6b9328b96d58dd6864c61b8 100644 (file)
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -359,7 +359,6 @@ int __init vesafb_init(void)
                }
        }
        
-       fb_info.node = NODEV;
        fb_info.fbops = &vesafb_ops;
        fb_info.var = vesafb_defined;
        fb_info.fix = vesafb_fix;
@@ -372,7 +371,7 @@ int __init vesafb_init(void)
                return -EINVAL;
 
        printk(KERN_INFO "fb%d: %s frame buffer device\n",
-              minor(fb_info.node), fb_info.fix.id);
+              fb_info.node, fb_info.fix.id);
        return 0;
 }
 

diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c
index 1259ff94bc66540cd246eef21d60bcd18fb82118..4fce711339a2e98177d49cf4865bc7906956e75c 100644 (file)
--- a/drivers/video/vfb.c
+++ b/drivers/video/vfb.c
@@ -426,7 +426,6 @@ int __init vfb_init(void)
        memset(videomemory, 0, videomemorysize);
 
        fb_info.screen_base = videomemory;
-       fb_info.node = NODEV;
        fb_info.fbops = &vfb_ops;
 
        retval = fb_find_mode(&fb_info.var, &fb_info, NULL,
@@ -447,7 +446,7 @@ int __init vfb_init(void)
 
        printk(KERN_INFO
               "fb%d: Virtual frame buffer device, using %ldK of video memory\n",
-              minor(fb_info.node), videomemorysize >> 10);
+              fb_info.node, videomemorysize >> 10);
        return 0;
 }
 

diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 81c7ff2046ce9e318305b4735c3c6c423d734adb..c670437beb9d4ebe02d06904b0e424a33f7d09f5 100644 (file)
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1364,7 +1364,6 @@ int __init vga16fb_init(void)
        vga16fb_defined.blue.length  = i;       
 
        /* name should not depend on EGA/VGA */
-       vga16fb.node = NODEV;
        vga16fb.fbops = &vga16fb_ops;
        vga16fb.var = vga16fb_defined;
        vga16fb.fix = vga16fb_fix;
@@ -1385,7 +1384,7 @@ int __init vga16fb_init(void)
        }
 
        printk(KERN_INFO "fb%d: %s frame buffer device\n",
-              minor(vga16fb.node), vga16fb.fix.id);
+              vga16fb.node, vga16fb.fix.id);
 
        return 0;
 }

diff --git a/drivers/video/virgefb.c b/drivers/video/virgefb.c
index 2c23f3294f0e065ea34e2fa3a4c4edbeefc575d3..8d512fd79a231065fe3fb4f79efed05f30a346e2 100644 (file)
--- a/drivers/video/virgefb.c
+++ b/drivers/video/virgefb.c
@@ -1783,7 +1783,6 @@ int __init virgefb_init(void)
        fbhw = &virgefb_hw_switch;
        strcpy(fb_info.modename, virgefb_name);
        fb_info.changevar = NULL;
-       fb_info.node = NODEV;
        fb_info.fbops = &virgefb_ops;
        fb_info.disp = &disp;
        fb_info.currcon = -1;
@@ -1806,7 +1805,7 @@ int __init virgefb_init(void)
        }
 
        printk(KERN_INFO "fb%d: %s frame buffer device, using %ldK of video memory\n",
-              minor(fb_info.node), fb_info.modename, v_ram_size>>10);
+              fb_info.node, fb_info.modename, v_ram_size>>10);
 
        /* TODO: This driver cannot be unloaded yet */
 

diff --git a/include/linux/fb.h b/include/linux/fb.h
index b4e2dbcb821265d2997c782980094f845fc97e99..5ba81ae1ccad0451e202038dbf1a796a8decbd5b 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -396,7 +396,7 @@ struct fb_ops {
 };
 
 struct fb_info {
-   kdev_t node;
+   int node;
    int flags;
    int open;                            /* Has this been open already ? */
 #define FBINFO_FLAG_MODULE     1       /* Low-level driver is a module */

diff --git a/include/linux/kdev_t.h b/include/linux/kdev_t.h
index 60e286b694c5d00eeca048d2dfd35471b4fcb61b..64a348f59cc7f614f186377b453c54c07b341ae4 100644 (file)
--- a/include/linux/kdev_t.h
+++ b/include/linux/kdev_t.h
@@ -99,7 +99,6 @@ static inline kdev_t val_to_kdev(unsigned int val)
 
 #define HASHDEV(dev)   (kdev_val(dev))
 #define NODEV          (mk_kdev(0,0))
-#define B_FREE         (mk_kdev(0xff,0xff))
 
 static inline int kdev_same(kdev_t dev1, kdev_t dev2)
 {

diff --git a/include/video/pm3fb.h b/include/video/pm3fb.h
index a3c44ca252be77d3526236b09c23112a3f96757e..49383fd724ae390929ada446fcf51caa6b79912a 100644 (file)
--- a/include/video/pm3fb.h
+++ b/include/video/pm3fb.h
@@ -1147,11 +1147,6 @@
 #define MUST_BYTESWAP
 #endif
 
-/* for compatibility between 2.5, 2.4 and 2.2 */
-#ifndef B_FREE
-#define B_FREE   -1
-#endif
-
 /* permedia3 -specific definitions */
 #define PM3_SCALE_TO_CLOCK(pr, fe, po) ((2 * PM3_REF_CLOCK * fe) / (pr * (1 << (po))))