Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659f675e authored by Emil Goode's avatar Emil Goode Committed by Florian Tobias Schandinat
Browse files

aty128fb: Fix coding style issues 



This patch cleans up some coding style issues.

-Some lines are indented with 4 spaces, most of this code
 is not used but it should be correctly indented anyway.

-I also fixed some long lines exceeding the 80 char limit.

Signed-off-by: default avatarEmil Goode <emilgoode@gmail.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 6fcdbc0c

drivers/video/aty/aty128fb.c

+101 −79
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ 
#undef DEBUG



#ifdef DEBUG

#define DBG(fmt, args...)		printk(KERN_DEBUG "aty128fb: %s " fmt, __func__, ##args);

#define DBG(fmt, args...) \

	printk(KERN_DEBUG "aty128fb: %s " fmt, __func__, ##args);

#else

#define DBG(fmt, args...)

#endif
@@ -450,7 +451,8 @@ static int aty128_decode_var(struct fb_var_screeninfo *var, 
#if 0

static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,

					 void __iomem *bios);

static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev, const struct aty128fb_par *par);

static void __devinit __iomem *aty128_map_ROM(struct pci_dev *pdev,

					      const struct aty128fb_par *par);

#endif

static void aty128_timings(struct aty128fb_par *par);

static void aty128_init_engine(struct aty128fb_par *par);
@@ -779,7 +781,8 @@ static u32 depth_to_dst(u32 depth) 




#ifndef __sparc__

static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, struct pci_dev *dev)

static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par,

					       struct pci_dev *dev)

{

	u16 dptr;

	u8 rom_type;
@@ -811,13 +814,14 @@ static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, s 
	/* Look for the PCI data to check the ROM type */

	dptr = BIOS_IN16(0x18);



	/* Check the PCI data signature. If it's wrong, we still assume a normal x86 ROM

	 * for now, until I've verified this works everywhere. The goal here is more

	 * to phase out Open Firmware images.

	/* Check the PCI data signature. If it's wrong, we still assume a normal

	 * x86 ROM for now, until I've verified this works everywhere.

	 * The goal here is more to phase out Open Firmware images.

	 *

	 * Currently, we only look at the first PCI data, we could iteratre and deal with

	 * them all, and we should use fb_bios_start relative to start of image and not

	 * relative start of ROM, but so far, I never found a dual-image ATI card

	 * Currently, we only look at the first PCI data, we could iteratre and

	 * deal with them all, and we should use fb_bios_start relative to start

	 * of image and not relative start of ROM, but so far, I never found a

	 * dual-image ATI card.

	 *

	 * typedef struct {

	 * 	u32	signature;	+ 0x00
@@ -852,7 +856,8 @@ static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, s 
		printk(KERN_INFO "aty128fb: Found HP PA-RISC ROM Image\n");

		goto failed;

	default:

		printk(KERN_INFO "aty128fb: Found unknown type %d ROM Image\n", rom_type);

		printk(KERN_INFO "aty128fb: Found unknown type %d ROM Image\n",

		       rom_type);

		goto failed;

	}

 anyway:
@@ -863,7 +868,8 @@ static void __iomem * __devinit aty128_map_ROM(const struct aty128fb_par *par, s 
	return NULL;

}



static void __devinit aty128_get_pllinfo(struct aty128fb_par *par, unsigned char __iomem *bios)

static void __devinit aty128_get_pllinfo(struct aty128fb_par *par,

					 unsigned char __iomem *bios)

{

	unsigned int bios_hdr;

	unsigned int bios_pll;
@@ -1247,10 +1253,13 @@ static int aty128_crtc_to_var(const struct aty128_crtc *crtc, 
static void aty128_set_crt_enable(struct aty128fb_par *par, int on)

{

	if (on) {

		aty_st_le32(CRTC_EXT_CNTL, aty_ld_le32(CRTC_EXT_CNTL) | CRT_CRTC_ON);

		aty_st_le32(DAC_CNTL, (aty_ld_le32(DAC_CNTL) | DAC_PALETTE2_SNOOP_EN));

		aty_st_le32(CRTC_EXT_CNTL, aty_ld_le32(CRTC_EXT_CNTL) |

			    CRT_CRTC_ON);

		aty_st_le32(DAC_CNTL, (aty_ld_le32(DAC_CNTL) |

			    DAC_PALETTE2_SNOOP_EN));

	} else

		aty_st_le32(CRTC_EXT_CNTL, aty_ld_le32(CRTC_EXT_CNTL) & ~CRT_CRTC_ON);

		aty_st_le32(CRTC_EXT_CNTL, aty_ld_le32(CRTC_EXT_CNTL) &

			    ~CRT_CRTC_ON);

}



static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)
@@ -1281,7 +1290,8 @@ static void aty128_set_lcd_enable(struct aty128fb_par *par, int on) 
	}

}



static void aty128_set_pll(struct aty128_pll *pll, const struct aty128fb_par *par)

static void aty128_set_pll(struct aty128_pll *pll,

			   const struct aty128fb_par *par)

{

	u32 div3;
@@ -1366,7 +1376,8 @@ static int aty128_var_to_pll(u32 period_in_ps, struct aty128_pll *pll, 
}





static int aty128_pll_to_var(const struct aty128_pll *pll, struct fb_var_screeninfo *var)

static int aty128_pll_to_var(const struct aty128_pll *pll,

			     struct fb_var_screeninfo *var)

{

	var->pixclock = 100000000 / pll->vclk;
@@ -1512,7 +1523,8 @@ static int aty128fb_set_par(struct fb_info *info) 
 *  encode/decode the User Defined Part of the Display

 */



static int aty128_decode_var(struct fb_var_screeninfo *var, struct aty128fb_par *par)

static int aty128_decode_var(struct fb_var_screeninfo *var,

			     struct aty128fb_par *par)

{

	int err;

	struct aty128_crtc crtc;
@@ -1559,7 +1571,8 @@ static int aty128_encode_var(struct fb_var_screeninfo *var, 
}           





static int aty128fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)

static int aty128fb_check_var(struct fb_var_screeninfo *var,

			      struct fb_info *info)

{

	struct aty128fb_par par;

	int err;
@@ -1575,7 +1588,8 @@ static int aty128fb_check_var(struct fb_var_screeninfo *var, struct fb_info *inf 
/*

 *  Pan or Wrap the Display

 */

static int aty128fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *fb) 

static int aty128fb_pan_display(struct fb_var_screeninfo *var,

				struct fb_info *fb)

{

	struct aty128fb_par *par = fb->par;

	u32 xoffset, yoffset;
@@ -1594,7 +1608,8 @@ static int aty128fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *f 
	par->crtc.xoffset = xoffset;

	par->crtc.yoffset = yoffset;



	offset = ((yoffset * par->crtc.vxres + xoffset)*(par->crtc.bpp >> 3)) & ~7;

	offset = ((yoffset * par->crtc.vxres + xoffset) * (par->crtc.bpp >> 3))

									  & ~7;



	if (par->crtc.bpp == 24)

		offset += 8 * (offset % 3); /* Must be multiple of 8 and 3 */
@@ -1620,11 +1635,13 @@ static void aty128_st_pal(u_int regno, u_int red, u_int green, u_int blue, 
		 * do mirroring

		 */



		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) | DAC_PALETTE_ACCESS_CNTL);

		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) |

			    DAC_PALETTE_ACCESS_CNTL);

		aty_st_8(PALETTE_INDEX, regno);

		aty_st_le32(PALETTE_DATA, (red<<16)|(green<<8)|blue);

#endif

		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) & ~DAC_PALETTE_ACCESS_CNTL);

		aty_st_le32(DAC_CNTL, aty_ld_le32(DAC_CNTL) &

			    ~DAC_PALETTE_ACCESS_CNTL);

	}



	aty_st_8(PALETTE_INDEX, regno);
@@ -1753,7 +1770,8 @@ static int aty128_bl_update_status(struct backlight_device *bd) 
			aty_st_le32(LVDS_GEN_CNTL, reg);

		}

		reg &= ~LVDS_BL_MOD_LEVEL_MASK;

		reg |= (aty128_bl_get_level_brightness(par, level) << LVDS_BL_MOD_LEVEL_SHIFT);

		reg |= (aty128_bl_get_level_brightness(par, level) <<

			LVDS_BL_MOD_LEVEL_SHIFT);

#ifdef BACKLIGHT_LVDS_OFF

		reg |= LVDS_ON | LVDS_EN;

		reg &= ~LVDS_DISPLAY_DIS;
@@ -1764,7 +1782,8 @@ static int aty128_bl_update_status(struct backlight_device *bd) 
#endif

	} else {

		reg &= ~LVDS_BL_MOD_LEVEL_MASK;

		reg |= (aty128_bl_get_level_brightness(par, 0) << LVDS_BL_MOD_LEVEL_SHIFT);

		reg |= (aty128_bl_get_level_brightness(par, 0) <<

			LVDS_BL_MOD_LEVEL_SHIFT);

#ifdef BACKLIGHT_LVDS_OFF

		reg |= LVDS_DISPLAY_DIS;

		aty_st_le32(LVDS_GEN_CNTL, reg);
@@ -1869,7 +1888,8 @@ static void aty128_early_resume(void *data) 
}

#endif /* CONFIG_PPC_PMAC */



static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)

static int __devinit aty128_init(struct pci_dev *pdev,

				 const struct pci_device_id *ent)

{

	struct fb_info *info = pci_get_drvdata(pdev);

	struct aty128fb_par *par = info->par;
@@ -1887,7 +1907,8 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i 


	/* range check to make sure */

	if (ent->driver_data < ARRAY_SIZE(r128_family))

	    strlcat(video_card, r128_family[ent->driver_data], sizeof(video_card));

		strlcat(video_card, r128_family[ent->driver_data],

			sizeof(video_card));



	printk(KERN_INFO "aty128fb: %s [chip rev 0x%x] ", video_card, chip_rev);
@@ -1911,11 +1932,11 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i 
		/* Indicate sleep capability */

		if (par->chip_gen == rage_M3) {

			pmac_call_feature(PMAC_FTR_DEVICE_CAN_WAKE, NULL, 0, 1);

#if 0 /* Disable the early video resume hack for now as it's causing problems, among

       * others we now rely on the PCI core restoring the config space for us, which

       * isn't the case with that hack, and that code path causes various things to

       * be called with interrupts off while they shouldn't. I'm leaving the code in

       * as it can be useful for debugging purposes

#if 0 /* Disable the early video resume hack for now as it's causing problems,

       * among others we now rely on the PCI core restoring the config space

       * for us, which isn't the case with that hack, and that code path causes

       * various things to be called with interrupts off while they shouldn't.

       * I'm leaving the code in as it can be useful for debugging purposes

       */

			pmac_set_early_video_resume(aty128_early_resume, par);

#endif
@@ -2018,7 +2039,8 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i 


#ifdef CONFIG_PCI

/* register a card    ++ajoshi */

static int __devinit aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

static int __devinit aty128_probe(struct pci_dev *pdev,

				  const struct pci_device_id *ent)

{

	unsigned long fb_addr, reg_addr;

	struct aty128fb_par *par;
@@ -2358,8 +2380,8 @@ static inline void aty128_rectcopy(int srcx, int srcy, int dstx, int dsty, 
     * Text mode accelerated functions

     */



static void fbcon_aty128_bmove(struct display *p, int sy, int sx, int dy, int dx,

			int height, int width)

static void fbcon_aty128_bmove(struct display *p, int sy, int sx, int dy,

			       int dx, int height, int width)

{

	sx     *= fontwidth(p);

	sy     *= fontheight(p);