From 403ae52ac047eb339f2b7e8cdf93a3b8077914db Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Sat, 26 Apr 2008 22:29:43 -0700 Subject: sparc: fix drivers/video/tcx.c warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix compile warning: CC drivers/video/tcx.o drivers/video/tcx.c: In function ‘tcx_init_one’: drivers/video/tcx.c:477: warning: format ‘%lx’ expects type ‘long unsigned int’, but argument 4 has type ‘resource_size_t’ This was the only sparc driver to use the resource directly in the printk so I changed it to physbase like the other drivers. Boot tested on SS4. Signed-off-by: Robert Reif Signed-off-by: David S. Miller --- drivers/video/tcx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index e5a9ddb..fd94dfb 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c @@ -419,7 +419,7 @@ static int __devinit tcx_init_one(struct of_device *op) par->mmap_map[6].size = SBUS_MMAP_EMPTY; } - par->physbase = 0; + par->physbase = op->resource[0].start; par->which_io = op->resource[0].flags & IORESOURCE_BITS; for (i = 0; i < TCX_MMAP_ENTRIES; i++) { @@ -473,7 +473,7 @@ static int __devinit tcx_init_one(struct of_device *op) printk("%s: TCX at %lx:%lx, %s\n", dp->full_name, par->which_io, - op->resource[0].start, + par->physbase, par->lowdepth ? "8-bit only" : "24-bit depth"); return 0; -- cgit v1.1 From 2556bf1212c768f567401257582681aa117af4a9 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Sun, 27 Apr 2008 15:16:59 -0700 Subject: sparc: bw2.c fix bw2_exit Fix void function bw2_exit returning value. Signed-off-by: Robert Reif Signed-off-by: David S. Miller --- drivers/video/bw2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 833b10c..bb0bb55 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c @@ -399,10 +399,9 @@ static int __init bw2_init(void) static void __exit bw2_exit(void) { - return of_unregister_driver(&bw2_driver); + of_unregister_driver(&bw2_driver); } - module_init(bw2_init); module_exit(bw2_exit); -- cgit v1.1 From 544330009bc5b879129593236aab29e458ec9fe4 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Sun, 27 Apr 2008 15:17:23 -0700 Subject: sparc: cg14.c make cg14_init and cg15_exit static Make cg14_init and cg14_exit static. Signed-off-by: Robert Reif Signed-off-by: David S. Miller --- drivers/video/cg14.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index fdc9f43..359734e 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c @@ -605,7 +605,7 @@ static struct of_platform_driver cg14_driver = { .remove = __devexit_p(cg14_remove), }; -int __init cg14_init(void) +static int __init cg14_init(void) { if (fb_get_options("cg14fb", NULL)) return -ENODEV; @@ -613,7 +613,7 @@ int __init cg14_init(void) return of_register_driver(&cg14_driver, &of_bus_type); } -void __exit cg14_exit(void) +static void __exit cg14_exit(void) { of_unregister_driver(&cg14_driver); } -- cgit v1.1 From a2fb0ce7aeae9c38146df9c2d9b763e5981a0683 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Sun, 27 Apr 2008 15:17:49 -0700 Subject: sparc: ffb.c make ffb_init and ffb_exit static Make ffb_init and ffb_exit static. Remove unnecessary function prototype. Signed-off-by: Robert Reif Signed-off-by: David S. Miller --- drivers/video/ffb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index d7e2488..02a6114 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c @@ -32,7 +32,6 @@ static int ffb_setcolreg(unsigned, unsigned, unsigned, unsigned, unsigned, struct fb_info *); static int ffb_blank(int, struct fb_info *); -static void ffb_init_fix(struct fb_info *); static void ffb_imageblit(struct fb_info *, const struct fb_image *); static void ffb_fillrect(struct fb_info *, const struct fb_fillrect *); @@ -1062,7 +1061,7 @@ static struct of_platform_driver ffb_driver = { .remove = __devexit_p(ffb_remove), }; -int __init ffb_init(void) +static int __init ffb_init(void) { if (fb_get_options("ffb", NULL)) return -ENODEV; @@ -1070,7 +1069,7 @@ int __init ffb_init(void) return of_register_driver(&ffb_driver, &of_bus_type); } -void __exit ffb_exit(void) +static void __exit ffb_exit(void) { of_unregister_driver(&ffb_driver); } -- cgit v1.1 From f36861d550e6f1a1a7a851b88938f52bdaed7682 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Sun, 27 Apr 2008 15:18:12 -0700 Subject: sparc: tcx.c make tcx_init and tcx_exit static Make tcx_init and tcx_exit static. Signed-off-by: Robert Reif Signed-off-by: David S. Miller --- drivers/video/tcx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index fd94dfb..7dc33bf 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c @@ -527,7 +527,7 @@ static struct of_platform_driver tcx_driver = { .remove = __devexit_p(tcx_remove), }; -int __init tcx_init(void) +static int __init tcx_init(void) { if (fb_get_options("tcxfb", NULL)) return -ENODEV; @@ -535,7 +535,7 @@ int __init tcx_init(void) return of_register_driver(&tcx_driver, &of_bus_type); } -void __exit tcx_exit(void) +static void __exit tcx_exit(void) { of_unregister_driver(&tcx_driver); } -- cgit v1.1 From 194f1a68b93e959ede6ec363db4714e630bdbb6a Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Sun, 27 Apr 2008 15:18:57 -0700 Subject: sparc: video drivers: add facility level Add KERN_ facility level to sparc video drivers. Signed-off-by: Robert Reif Signed-off-by: David S. Miller --- drivers/video/bw2.c | 2 +- drivers/video/cg14.c | 2 +- drivers/video/cg3.c | 2 +- drivers/video/cg6.c | 2 +- drivers/video/ffb.c | 2 +- drivers/video/leo.c | 2 +- drivers/video/p9100.c | 2 +- drivers/video/tcx.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index bb0bb55..275d9da 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c @@ -339,7 +339,7 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id * dev_set_drvdata(&op->dev, info); - printk("%s: bwtwo at %lx:%lx\n", + printk(KERN_INFO "%s: bwtwo at %lx:%lx\n", dp->full_name, par->which_io, par->physbase); return 0; diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index 359734e..0db0fec 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c @@ -556,7 +556,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id dev_set_drvdata(&op->dev, info); - printk("%s: cgfourteen at %lx:%lx, %dMB\n", + printk(KERN_INFO "%s: cgfourteen at %lx:%lx, %dMB\n", dp->full_name, par->iospace, par->physbase, par->ramsize >> 20); diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index a5c7fb3..010ea53 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c @@ -419,7 +419,7 @@ static int __devinit cg3_probe(struct of_device *op, dev_set_drvdata(&op->dev, info); - printk("%s: cg3 at %lx:%lx\n", + printk(KERN_INFO "%s: cg3 at %lx:%lx\n", dp->full_name, par->which_io, par->physbase); return 0; diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 549891d..fc90db6 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c @@ -781,7 +781,7 @@ static int __devinit cg6_probe(struct of_device *op, dev_set_drvdata(&op->dev, info); - printk("%s: CGsix [%s] at %lx:%lx\n", + printk(KERN_INFO "%s: CGsix [%s] at %lx:%lx\n", dp->full_name, info->fix.id, par->which_io, par->physbase); diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 02a6114..93dca3e 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c @@ -1000,7 +1000,7 @@ static int __devinit ffb_probe(struct of_device *op, dev_set_drvdata(&op->dev, info); - printk("%s: %s at %016lx, type %d, " + printk(KERN_INFO "%s: %s at %016lx, type %d, " "DAC pnum[%x] rev[%d] manuf_rev[%d]\n", dp->full_name, ((par->flags & FFB_FLAG_AFB) ? "AFB" : "FFB"), diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 45b9a5d..f3160fc 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c @@ -614,7 +614,7 @@ static int __devinit leo_probe(struct of_device *op, const struct of_device_id * dev_set_drvdata(&op->dev, info); - printk("%s: leo at %lx:%lx\n", + printk(KERN_INFO "%s: leo at %lx:%lx\n", dp->full_name, par->which_io, par->physbase); diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 5849606..c95874f 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c @@ -310,7 +310,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id dev_set_drvdata(&op->dev, info); - printk("%s: p9100 at %lx:%lx\n", + printk(KERN_INFO "%s: p9100 at %lx:%lx\n", dp->full_name, par->which_io, par->physbase); diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index 7dc33bf..a717743 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c @@ -470,7 +470,7 @@ static int __devinit tcx_init_one(struct of_device *op) dev_set_drvdata(&op->dev, info); - printk("%s: TCX at %lx:%lx, %s\n", + printk(KERN_INFO "%s: TCX at %lx:%lx, %s\n", dp->full_name, par->which_io, par->physbase, -- cgit v1.1