aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-10-16 04:29:11 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:18 -0400
commit7345de32df7ef0ab49eaa88cad1297d8572a6757 (patch)
treeeacb8e22e089f0d8d8da7d3dec5cfc48ac85aede
parent8503df65976d0f845f49e8debff55c031635754e (diff)
cirrusfb: remove typedefs
This patch replaces "typedef enum" with "enum type" constructs. Using the typedef is error for the checkpatch.pl script. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/cirrusfb.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 0b9fe74630f1..8c0603cc02a3 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -110,7 +110,7 @@
110 */ 110 */
111 111
112/* board types */ 112/* board types */
113typedef enum { 113enum cirrus_board {
114 BT_NONE = 0, 114 BT_NONE = 0,
115 BT_SD64, 115 BT_SD64,
116 BT_PICCOLO, 116 BT_PICCOLO,
@@ -120,12 +120,12 @@ typedef enum {
120 BT_ALPINE, /* GD543x/4x */ 120 BT_ALPINE, /* GD543x/4x */
121 BT_GD5480, 121 BT_GD5480,
122 BT_LAGUNA, /* GD546x */ 122 BT_LAGUNA, /* GD546x */
123} cirrusfb_board_t; 123};
124 124
125/* 125/*
126 * per-board-type information, used for enumerating and abstracting 126 * per-board-type information, used for enumerating and abstracting
127 * chip-specific information 127 * chip-specific information
128 * NOTE: MUST be in the same order as cirrusfb_board_t in order to 128 * NOTE: MUST be in the same order as enum cirrus_board in order to
129 * use direct indexing on this array 129 * use direct indexing on this array
130 * NOTE: '__initdata' cannot be used as some of this info 130 * NOTE: '__initdata' cannot be used as some of this info
131 * is required at runtime. Maybe separate into an init-only and 131 * is required at runtime. Maybe separate into an init-only and
@@ -361,10 +361,10 @@ struct cirrusfb_regs {
361}; 361};
362 362
363#ifdef CIRRUSFB_DEBUG 363#ifdef CIRRUSFB_DEBUG
364typedef enum { 364enum cirrusfb_dbg_reg_class {
365 CRT, 365 CRT,
366 SEQ 366 SEQ
367} cirrusfb_dbg_reg_class_t; 367};
368#endif /* CIRRUSFB_DEBUG */ 368#endif /* CIRRUSFB_DEBUG */
369 369
370/* info about board */ 370/* info about board */
@@ -375,7 +375,7 @@ struct cirrusfb_info {
375 u8 __iomem *regbase; 375 u8 __iomem *regbase;
376 u8 __iomem *mem; 376 u8 __iomem *mem;
377 unsigned long size; 377 unsigned long size;
378 cirrusfb_board_t btype; 378 enum cirrus_board btype;
379 unsigned char SFR; /* Shadow of special function register */ 379 unsigned char SFR; /* Shadow of special function register */
380 380
381 unsigned long fbmem_phys; 381 unsigned long fbmem_phys;
@@ -571,7 +571,7 @@ static void bestclock(long freq, long *best,
571static void cirrusfb_dump(void); 571static void cirrusfb_dump(void);
572static void cirrusfb_dbg_reg_dump(caddr_t regbase); 572static void cirrusfb_dbg_reg_dump(caddr_t regbase);
573static void cirrusfb_dbg_print_regs(caddr_t regbase, 573static void cirrusfb_dbg_print_regs(caddr_t regbase,
574 cirrusfb_dbg_reg_class_t reg_class, ...); 574 enum cirrusfb_dbg_reg_class reg_class, ...);
575static void cirrusfb_dbg_print_byte(const char *name, unsigned char val); 575static void cirrusfb_dbg_print_byte(const char *name, unsigned char val);
576#endif /* CIRRUSFB_DEBUG */ 576#endif /* CIRRUSFB_DEBUG */
577 577
@@ -2449,7 +2449,7 @@ static int cirrusfb_register(struct cirrusfb_info *cinfo)
2449{ 2449{
2450 struct fb_info *info; 2450 struct fb_info *info;
2451 int err; 2451 int err;
2452 cirrusfb_board_t btype; 2452 enum cirrus_board btype;
2453 2453
2454 DPRINTK("ENTER\n"); 2454 DPRINTK("ENTER\n");
2455 2455
@@ -2517,7 +2517,7 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
2517{ 2517{
2518 struct cirrusfb_info *cinfo; 2518 struct cirrusfb_info *cinfo;
2519 struct fb_info *info; 2519 struct fb_info *info;
2520 cirrusfb_board_t btype; 2520 enum cirrus_board btype;
2521 unsigned long board_addr, board_size; 2521 unsigned long board_addr, board_size;
2522 int ret; 2522 int ret;
2523 2523
@@ -2537,11 +2537,11 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
2537 cinfo = info->par; 2537 cinfo = info->par;
2538 cinfo->info = info; 2538 cinfo->info = info;
2539 cinfo->pdev = pdev; 2539 cinfo->pdev = pdev;
2540 cinfo->btype = btype = (cirrusfb_board_t) ent->driver_data; 2540 cinfo->btype = btype = (enum cirrus_board) ent->driver_data;
2541 2541
2542 DPRINTK(" Found PCI device, base address 0 is 0x%lx, btype set to %d\n", 2542 DPRINTK(" Found PCI device, base address 0 is 0x%x, btype set to %d\n",
2543 pdev->resource[0].start, btype); 2543 pdev->resource[0].start, btype);
2544 DPRINTK(" base address 1 is 0x%lx\n", pdev->resource[1].start); 2544 DPRINTK(" base address 1 is 0x%x\n", pdev->resource[1].start);
2545 2545
2546 if (isPReP) { 2546 if (isPReP) {
2547 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, 0x00000000); 2547 pci_write_config_dword(pdev, PCI_BASE_ADDRESS_0, 0x00000000);
@@ -2647,7 +2647,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
2647{ 2647{
2648 struct cirrusfb_info *cinfo; 2648 struct cirrusfb_info *cinfo;
2649 struct fb_info *info; 2649 struct fb_info *info;
2650 cirrusfb_board_t btype; 2650 enum cirrus_board btype;
2651 struct zorro_dev *z2 = NULL; 2651 struct zorro_dev *z2 = NULL;
2652 unsigned long board_addr, board_size, size; 2652 unsigned long board_addr, board_size, size;
2653 int ret; 2653 int ret;
@@ -3353,7 +3353,7 @@ void cirrusfb_dbg_print_byte(const char *name, unsigned char val)
3353 3353
3354static 3354static
3355void cirrusfb_dbg_print_regs(caddr_t regbase, 3355void cirrusfb_dbg_print_regs(caddr_t regbase,
3356 cirrusfb_dbg_reg_class_t reg_class, ...) 3356 enum cirrusfb_dbg_reg_class reg_class, ...)
3357{ 3357{
3358 va_list list; 3358 va_list list;
3359 unsigned char val = 0; 3359 unsigned char val = 0;