Commit cbb91d5d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Bartlomiej Zolnierkiewicz
Browse files

fbdev: atafb: Modernize printing of kernel messages 



Now the driver has been converted to a platform driver, the legacy
printk() calls without any log level can be replaced by proper dev_*()
calls.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 80cf9635

drivers/video/fbdev/atafb.c

+13 −12
Original line number Diff line number Diff line
@@ -3083,12 +3083,12 @@ static int __init atafb_probe(struct platform_device *pdev) 
	if (fb_get_options("atafb", &option))

		return -ENODEV;

	atafb_setup(option);

	printk("atafb_init: start\n");

	dev_dbg(&pdev->dev, "%s: start\n", __func__);



	do {

#ifdef ATAFB_EXT

		if (external_addr) {

			printk("atafb_init: initializing external hw\n");

			dev_dbg(&pdev->dev, "initializing external hw\n");

			fbhw = &ext_switch;

			atafb_ops.fb_setcolreg = &ext_setcolreg;

			defmode = DEFMODE_EXT;
@@ -3097,7 +3097,7 @@ static int __init atafb_probe(struct platform_device *pdev) 
#endif

#ifdef ATAFB_TT

		if (ATARIHW_PRESENT(TT_SHIFTER)) {

			printk("atafb_init: initializing TT hw\n");

			dev_dbg(&pdev->dev, "initializing TT hw\n");

			fbhw = &tt_switch;

			atafb_ops.fb_setcolreg = &tt_setcolreg;

			defmode = DEFMODE_TT;
@@ -3106,7 +3106,7 @@ static int __init atafb_probe(struct platform_device *pdev) 
#endif

#ifdef ATAFB_FALCON

		if (ATARIHW_PRESENT(VIDEL_SHIFTER)) {

			printk("atafb_init: initializing Falcon hw\n");

			dev_dbg(&pdev->dev, "initializing Falcon hw\n");

			fbhw = &falcon_switch;

			atafb_ops.fb_setcolreg = &falcon_setcolreg;

			error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, 0,
@@ -3121,7 +3121,7 @@ static int __init atafb_probe(struct platform_device *pdev) 
#ifdef ATAFB_STE

		if (ATARIHW_PRESENT(STND_SHIFTER) ||

		    ATARIHW_PRESENT(EXTD_SHIFTER)) {

			printk("atafb_init: initializing ST/E hw\n");

			dev_dbg(&pdev->dev, "initializing ST/E hw\n");

			fbhw = &st_switch;

			atafb_ops.fb_setcolreg = &stste_setcolreg;

			defmode = DEFMODE_STE;
@@ -3129,7 +3129,8 @@ static int __init atafb_probe(struct platform_device *pdev) 
		}

		fbhw = &st_switch;

		atafb_ops.fb_setcolreg = &stste_setcolreg;

		printk("Cannot determine video hardware; defaulting to ST(e)\n");

		dev_warn(&pdev->dev,

			 "Cannot determine video hardware; defaulting to ST(e)\n");

#else /* ATAFB_STE */

		/* no default driver included */

		/* Nobody will ever see this message :-) */
@@ -3169,7 +3170,7 @@ static int __init atafb_probe(struct platform_device *pdev) 
			kernel_set_cachemode(screen_base, screen_len,

					     IOMAP_WRITETHROUGH);

		}

		printk("atafb: phys_screen_base %lx screen_len %d\n",

		dev_info(&pdev->dev, "phys_screen_base %lx screen_len %d\n",

			 phys_screen_base, screen_len);

#ifdef ATAFB_EXT

	} else {
@@ -3217,12 +3218,12 @@ static int __init atafb_probe(struct platform_device *pdev) 
	fb_alloc_cmap(&(fb_info.cmap), 1 << fb_info.var.bits_per_pixel, 0);





	printk("Determined %dx%d, depth %d\n",

	       fb_info.var.xres, fb_info.var.yres, fb_info.var.bits_per_pixel);

	dev_info(&pdev->dev, "Determined %dx%d, depth %d\n", fb_info.var.xres,

		 fb_info.var.yres, fb_info.var.bits_per_pixel);

	if ((fb_info.var.xres != fb_info.var.xres_virtual) ||

	    (fb_info.var.yres != fb_info.var.yres_virtual))

		printk("   virtual %dx%d\n", fb_info.var.xres_virtual,

		       fb_info.var.yres_virtual);

		dev_info(&pdev->dev, "   virtual %dx%d\n",

			 fb_info.var.xres_virtual, fb_info.var.yres_virtual);



	if (register_framebuffer(&fb_info) < 0) {

#ifdef ATAFB_EXT

CRA Git | Maintained and supported by SUSTech CRA and CCSE