* [PATCH] C99 Initialisers for drivers/video
@ 2003-04-05 14:21 Maciej Soltysiak
2003-04-05 18:51 ` James Simmons
2003-04-07 19:16 ` [PATCH] C99 Initialisers around scsi + ac97_codec.c Maciej Soltysiak
0 siblings, 2 replies; 6+ messages in thread
From: Maciej Soltysiak @ 2003-04-05 14:21 UTC (permalink / raw)
To: linux-kernel; +Cc: alan
Hello,
here is a set of C99 initialisers to 2.5 drivers/video files.
retz3fb.c | 16 +++++++-------
riva/fbdev.c | 58 ++++++++++++++++++++++++++--------------------------
sis/sis_accel.c | 48 +++++++++++++++++++++----------------------
sis/sis_main.c | 18 ++++++++--------
sis/sis_main.h | 62 ++++++++++++++++++++++++++++----------------------------
5 files changed, 101 insertions(+), 101 deletions(-)
Regards,
Maciej Soltysiak
diff -ru linux-2.5.66.orig/drivers/video/retz3fb.c linux-2.5.66/drivers/video/retz3fb.c
--- linux-2.5.66.orig/drivers/video/retz3fb.c 2003-03-05 04:29:34.000000000 +0100
+++ linux-2.5.66/drivers/video/retz3fb.c 2003-04-05 15:41:03.000000000 +0200
@@ -1589,13 +1589,13 @@
static struct display_switch fbcon_retz3_8 = {
- setup: fbcon_cfb8_setup,
- bmove: retz3_8_bmove,
- clear: retz3_8_clear,
- putc: retz3_putc,
- putcs: retz3_putcs,
- revc: retz3_revc,
- clear_margins: retz3_clear_margins,
- fontwidthmask: FONTWIDTH(8)
+ .setup = fbcon_cfb8_setup,
+ .bmove = retz3_8_bmove,
+ .clear = retz3_8_clear,
+ .putc = retz3_putc,
+ .putcs = retz3_putcs,
+ .revc = retz3_revc,
+ .clear_margins = retz3_clear_margins,
+ .fontwidthmask = FONTWIDTH(8)
};
#endif
diff -ru linux-2.5.66.orig/drivers/video/riva/fbdev.c linux-2.5.66/drivers/video/riva/fbdev.c
--- linux-2.5.66.orig/drivers/video/riva/fbdev.c 2003-04-02 19:12:16.000000000 +0200
+++ linux-2.5.66/drivers/video/riva/fbdev.c 2003-04-05 15:42:52.000000000 +0200
@@ -297,34 +297,34 @@
#endif
static struct fb_fix_screeninfo rivafb_fix = {
- id: "nVidia",
- type: FB_TYPE_PACKED_PIXELS,
- xpanstep: 1,
- ypanstep: 1,
+ .id = "nVidia",
+ .type = FB_TYPE_PACKED_PIXELS,
+ .xpanstep = 1,
+ .ypanstep = 1,
};
static struct fb_var_screeninfo rivafb_default_var = {
- xres: 640,
- yres: 480,
- xres_virtual: 640,
- yres_virtual: 480,
- bits_per_pixel: 8,
- red: {0, 8, 0},
- green: {0, 8, 0},
- blue: {0, 8, 0},
- transp: {0, 0, 0},
- activate: FB_ACTIVATE_NOW,
- height: -1,
- width: -1,
- accel_flags: FB_ACCELF_TEXT,
- pixclock: 39721,
- left_margin: 40,
- right_margin: 24,
- upper_margin: 32,
- lower_margin: 11,
- hsync_len: 96,
- vsync_len: 2,
- vmode: FB_VMODE_NONINTERLACED
+ .xres = 640,
+ .yres = 480,
+ .xres_virtual = 640,
+ .yres_virtual = 480,
+ .bits_per_pixel = 8,
+ .red = {0, 8, 0},
+ .green = {0, 8, 0},
+ .blue = {0, 8, 0},
+ .transp = {0, 0, 0},
+ .activate = FB_ACTIVATE_NOW,
+ .height = -1,
+ .width = -1,
+ .accel_flags = FB_ACCELF_TEXT,
+ .pixclock = 39721,
+ .left_margin = 40,
+ .right_margin = 24,
+ .upper_margin = 32,
+ .lower_margin = 11,
+ .hsync_len = 96,
+ .vsync_len = 2,
+ .vmode = FB_VMODE_NONINTERLACED
};
/* from GGI */
@@ -1984,10 +1984,10 @@
#endif /* !MODULE */
static struct pci_driver rivafb_driver = {
- name: "rivafb",
- id_table: rivafb_pci_tbl,
- probe: rivafb_probe,
- remove: __exit_p(rivafb_remove),
+ .name = "rivafb",
+ .id_table = rivafb_pci_tbl,
+ .probe = rivafb_probe,
+ .remove = __exit_p(rivafb_remove),
};
diff -ru linux-2.5.66.orig/drivers/video/sis/sis_accel.c linux-2.5.66/drivers/video/sis/sis_accel.c
--- linux-2.5.66.orig/drivers/video/sis/sis_accel.c 2003-04-02 19:12:16.000000000 +0200
+++ linux-2.5.66/drivers/video/sis/sis_accel.c 2003-04-05 15:55:07.000000000 +0200
@@ -591,38 +591,38 @@
#ifdef FBCON_HAS_CFB8
struct display_switch fbcon_sis8 = {
- setup: fbcon_cfb8_setup,
- bmove: fbcon_sis_bmove,
- clear: fbcon_sis_clear8,
- putc: fbcon_cfb8_putc,
- putcs: fbcon_cfb8_putcs,
- revc: fbcon_cfb8_revc,
- clear_margins: fbcon_cfb8_clear_margins,
- fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+ .setup = fbcon_cfb8_setup,
+ .bmove = fbcon_sis_bmove,
+ .clear = fbcon_sis_clear8,
+ .putc = fbcon_cfb8_putc,
+ .putcs = fbcon_cfb8_putcs,
+ .revc = fbcon_cfb8_revc,
+ .clear_margins = fbcon_cfb8_clear_margins,
+ .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
};
#endif
#ifdef FBCON_HAS_CFB16
struct display_switch fbcon_sis16 = {
- setup: fbcon_cfb16_setup,
- bmove: fbcon_sis_bmove,
- clear: fbcon_sis_clear16,
- putc: fbcon_cfb16_putc,
- putcs: fbcon_cfb16_putcs,
- revc: fbcon_sis_revc,
- clear_margins: fbcon_cfb16_clear_margins,
- fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+ .setup = fbcon_cfb16_setup,
+ .bmove = fbcon_sis_bmove,
+ .clear = fbcon_sis_clear16,
+ .putc = fbcon_cfb16_putc,
+ .putcs = fbcon_cfb16_putcs,
+ .revc = fbcon_sis_revc,
+ .clear_margins = fbcon_cfb16_clear_margins,
+ .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
};
#endif
#ifdef FBCON_HAS_CFB32
struct display_switch fbcon_sis32 = {
- setup: fbcon_cfb32_setup,
- bmove: fbcon_sis_bmove,
- clear: fbcon_sis_clear32,
- putc: fbcon_cfb32_putc,
- putcs: fbcon_cfb32_putcs,
- revc: fbcon_sis_revc,
- clear_margins: fbcon_cfb32_clear_margins,
- fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+ .setup = fbcon_cfb32_setup,
+ .bmove = fbcon_sis_bmove,
+ .clear = fbcon_sis_clear32,
+ .putc = fbcon_cfb32_putc,
+ .putcs = fbcon_cfb32_putcs,
+ .revc = fbcon_sis_revc,
+ .clear_margins = fbcon_cfb32_clear_margins,
+ .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
};
#endif
diff -ru linux-2.5.66.orig/drivers/video/sis/sis_main.c linux-2.5.66/drivers/video/sis/sis_main.c
--- linux-2.5.66.orig/drivers/video/sis/sis_main.c 2003-04-02 19:12:17.000000000 +0200
+++ linux-2.5.66/drivers/video/sis/sis_main.c 2003-04-05 15:57:26.000000000 +0200
@@ -2045,17 +2045,17 @@
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
static struct fb_ops sisfb_ops = {
- owner: THIS_MODULE,
- fb_get_fix: sisfb_get_fix,
- fb_get_var: sisfb_get_var,
- fb_set_var: sisfb_set_var,
- fb_get_cmap: sisfb_get_cmap,
- fb_set_cmap: sisfb_set_cmap,
+ .owner = THIS_MODULE,
+ .fb_get_fix = sisfb_get_fix,
+ .fb_get_var = sisfb_get_var,
+ .fb_set_var = sisfb_set_var,
+ .fb_get_cmap = sisfb_get_cmap,
+ .fb_set_cmap = sisfb_set_cmap,
#ifdef SISFB_PAN
- fb_pan_display: sisfb_pan_display,
+ .fb_pan_display = sisfb_pan_display,
#endif
- fb_ioctl: sisfb_ioctl,
- fb_mmap: sisfb_mmap,
+ .fb_ioctl = sisfb_ioctl,
+ .fb_mmap = sisfb_mmap,
};
#endif
diff -ru linux-2.5.66.orig/drivers/video/sis/sis_main.h linux-2.5.66/drivers/video/sis/sis_main.h
--- linux-2.5.66.orig/drivers/video/sis/sis_main.h 2003-04-02 19:12:17.000000000 +0200
+++ linux-2.5.66/drivers/video/sis/sis_main.h 2003-04-05 16:00:19.000000000 +0200
@@ -286,43 +286,43 @@
static int video_type = FB_TYPE_PACKED_PIXELS;
static struct fb_var_screeninfo default_var = {
- xres: 0,
- yres: 0,
- xres_virtual: 0,
- yres_virtual: 0,
- xoffset: 0,
- yoffset: 0,
- bits_per_pixel: 0,
- grayscale: 0,
- red: {0, 8, 0},
- green: {0, 8, 0},
- blue: {0, 8, 0},
- transp: {0, 0, 0},
- nonstd: 0,
- activate: FB_ACTIVATE_NOW,
- height: -1,
- width: -1,
- accel_flags: 0,
- pixclock: 0,
- left_margin: 0,
- right_margin: 0,
- upper_margin: 0,
- lower_margin: 0,
- hsync_len: 0,
- vsync_len: 0,
- sync: 0,
- vmode: FB_VMODE_NONINTERLACED,
+ .xres = 0,
+ .yres = 0,
+ .xres_virtual = 0,
+ .yres_virtual = 0,
+ .xoffset = 0,
+ .yoffset = 0,
+ .bits_per_pixel = 0,
+ .grayscale = 0,
+ .red = {0, 8, 0},
+ .green = {0, 8, 0},
+ .blue = {0, 8, 0},
+ .transp = {0, 0, 0},
+ .nonstd = 0,
+ .activate = FB_ACTIVATE_NOW,
+ .height = -1,
+ .width = -1,
+ .accel_flags = 0,
+ .pixclock = 0,
+ .left_margin = 0,
+ .right_margin = 0,
+ .upper_margin = 0,
+ .lower_margin = 0,
+ .hsync_len = 0,
+ .vsync_len = 0,
+ .sync = 0,
+ .vmode = FB_VMODE_NONINTERLACED,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- reserved: {0, 0, 0, 0, 0, 0}
+ .reserved = {0, 0, 0, 0, 0, 0}
#endif
};
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static struct fb_fix_screeninfo sisfb_fix = {
- id: "SiS",
- type: FB_TYPE_PACKED_PIXELS,
- xpanstep: 1,
- ypanstep: 1,
+ .id = "SiS",
+ .type = FB_TYPE_PACKED_PIXELS,
+ .xpanstep = 1,
+ .ypanstep = 1,
};
static char myid[20];
static u32 pseudo_palette[17];
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] C99 Initialisers for drivers/video
2003-04-05 14:21 [PATCH] C99 Initialisers for drivers/video Maciej Soltysiak
@ 2003-04-05 18:51 ` James Simmons
2003-04-07 19:16 ` [PATCH] C99 Initialisers around scsi + ac97_codec.c Maciej Soltysiak
1 sibling, 0 replies; 6+ messages in thread
From: James Simmons @ 2003-04-05 18:51 UTC (permalink / raw)
To: Maciej Soltysiak; +Cc: linux-kernel, alan
I have the patch in the fbdev BK tree. I shoudl be finished later today
with my final changes.
> Hello,
>
> here is a set of C99 initialisers to 2.5 drivers/video files.
>
> retz3fb.c | 16 +++++++-------
> riva/fbdev.c | 58 ++++++++++++++++++++++++++--------------------------
> sis/sis_accel.c | 48 +++++++++++++++++++++----------------------
> sis/sis_main.c | 18 ++++++++--------
> sis/sis_main.h | 62 ++++++++++++++++++++++++++++----------------------------
> 5 files changed, 101 insertions(+), 101 deletions(-)
>
> Regards,
> Maciej Soltysiak
>
> diff -ru linux-2.5.66.orig/drivers/video/retz3fb.c linux-2.5.66/drivers/video/retz3fb.c
> --- linux-2.5.66.orig/drivers/video/retz3fb.c 2003-03-05 04:29:34.000000000 +0100
> +++ linux-2.5.66/drivers/video/retz3fb.c 2003-04-05 15:41:03.000000000 +0200
> @@ -1589,13 +1589,13 @@
>
>
> static struct display_switch fbcon_retz3_8 = {
> - setup: fbcon_cfb8_setup,
> - bmove: retz3_8_bmove,
> - clear: retz3_8_clear,
> - putc: retz3_putc,
> - putcs: retz3_putcs,
> - revc: retz3_revc,
> - clear_margins: retz3_clear_margins,
> - fontwidthmask: FONTWIDTH(8)
> + .setup = fbcon_cfb8_setup,
> + .bmove = retz3_8_bmove,
> + .clear = retz3_8_clear,
> + .putc = retz3_putc,
> + .putcs = retz3_putcs,
> + .revc = retz3_revc,
> + .clear_margins = retz3_clear_margins,
> + .fontwidthmask = FONTWIDTH(8)
> };
> #endif
> diff -ru linux-2.5.66.orig/drivers/video/riva/fbdev.c linux-2.5.66/drivers/video/riva/fbdev.c
> --- linux-2.5.66.orig/drivers/video/riva/fbdev.c 2003-04-02 19:12:16.000000000 +0200
> +++ linux-2.5.66/drivers/video/riva/fbdev.c 2003-04-05 15:42:52.000000000 +0200
> @@ -297,34 +297,34 @@
> #endif
>
> static struct fb_fix_screeninfo rivafb_fix = {
> - id: "nVidia",
> - type: FB_TYPE_PACKED_PIXELS,
> - xpanstep: 1,
> - ypanstep: 1,
> + .id = "nVidia",
> + .type = FB_TYPE_PACKED_PIXELS,
> + .xpanstep = 1,
> + .ypanstep = 1,
> };
>
> static struct fb_var_screeninfo rivafb_default_var = {
> - xres: 640,
> - yres: 480,
> - xres_virtual: 640,
> - yres_virtual: 480,
> - bits_per_pixel: 8,
> - red: {0, 8, 0},
> - green: {0, 8, 0},
> - blue: {0, 8, 0},
> - transp: {0, 0, 0},
> - activate: FB_ACTIVATE_NOW,
> - height: -1,
> - width: -1,
> - accel_flags: FB_ACCELF_TEXT,
> - pixclock: 39721,
> - left_margin: 40,
> - right_margin: 24,
> - upper_margin: 32,
> - lower_margin: 11,
> - hsync_len: 96,
> - vsync_len: 2,
> - vmode: FB_VMODE_NONINTERLACED
> + .xres = 640,
> + .yres = 480,
> + .xres_virtual = 640,
> + .yres_virtual = 480,
> + .bits_per_pixel = 8,
> + .red = {0, 8, 0},
> + .green = {0, 8, 0},
> + .blue = {0, 8, 0},
> + .transp = {0, 0, 0},
> + .activate = FB_ACTIVATE_NOW,
> + .height = -1,
> + .width = -1,
> + .accel_flags = FB_ACCELF_TEXT,
> + .pixclock = 39721,
> + .left_margin = 40,
> + .right_margin = 24,
> + .upper_margin = 32,
> + .lower_margin = 11,
> + .hsync_len = 96,
> + .vsync_len = 2,
> + .vmode = FB_VMODE_NONINTERLACED
> };
>
> /* from GGI */
> @@ -1984,10 +1984,10 @@
> #endif /* !MODULE */
>
> static struct pci_driver rivafb_driver = {
> - name: "rivafb",
> - id_table: rivafb_pci_tbl,
> - probe: rivafb_probe,
> - remove: __exit_p(rivafb_remove),
> + .name = "rivafb",
> + .id_table = rivafb_pci_tbl,
> + .probe = rivafb_probe,
> + .remove = __exit_p(rivafb_remove),
> };
>
>
> diff -ru linux-2.5.66.orig/drivers/video/sis/sis_accel.c linux-2.5.66/drivers/video/sis/sis_accel.c
> --- linux-2.5.66.orig/drivers/video/sis/sis_accel.c 2003-04-02 19:12:16.000000000 +0200
> +++ linux-2.5.66/drivers/video/sis/sis_accel.c 2003-04-05 15:55:07.000000000 +0200
> @@ -591,38 +591,38 @@
>
> #ifdef FBCON_HAS_CFB8
> struct display_switch fbcon_sis8 = {
> - setup: fbcon_cfb8_setup,
> - bmove: fbcon_sis_bmove,
> - clear: fbcon_sis_clear8,
> - putc: fbcon_cfb8_putc,
> - putcs: fbcon_cfb8_putcs,
> - revc: fbcon_cfb8_revc,
> - clear_margins: fbcon_cfb8_clear_margins,
> - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
> + .setup = fbcon_cfb8_setup,
> + .bmove = fbcon_sis_bmove,
> + .clear = fbcon_sis_clear8,
> + .putc = fbcon_cfb8_putc,
> + .putcs = fbcon_cfb8_putcs,
> + .revc = fbcon_cfb8_revc,
> + .clear_margins = fbcon_cfb8_clear_margins,
> + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
> };
> #endif
> #ifdef FBCON_HAS_CFB16
> struct display_switch fbcon_sis16 = {
> - setup: fbcon_cfb16_setup,
> - bmove: fbcon_sis_bmove,
> - clear: fbcon_sis_clear16,
> - putc: fbcon_cfb16_putc,
> - putcs: fbcon_cfb16_putcs,
> - revc: fbcon_sis_revc,
> - clear_margins: fbcon_cfb16_clear_margins,
> - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
> + .setup = fbcon_cfb16_setup,
> + .bmove = fbcon_sis_bmove,
> + .clear = fbcon_sis_clear16,
> + .putc = fbcon_cfb16_putc,
> + .putcs = fbcon_cfb16_putcs,
> + .revc = fbcon_sis_revc,
> + .clear_margins = fbcon_cfb16_clear_margins,
> + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
> };
> #endif
> #ifdef FBCON_HAS_CFB32
> struct display_switch fbcon_sis32 = {
> - setup: fbcon_cfb32_setup,
> - bmove: fbcon_sis_bmove,
> - clear: fbcon_sis_clear32,
> - putc: fbcon_cfb32_putc,
> - putcs: fbcon_cfb32_putcs,
> - revc: fbcon_sis_revc,
> - clear_margins: fbcon_cfb32_clear_margins,
> - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
> + .setup = fbcon_cfb32_setup,
> + .bmove = fbcon_sis_bmove,
> + .clear = fbcon_sis_clear32,
> + .putc = fbcon_cfb32_putc,
> + .putcs = fbcon_cfb32_putcs,
> + .revc = fbcon_sis_revc,
> + .clear_margins = fbcon_cfb32_clear_margins,
> + .fontwidthmask = FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
> };
> #endif
>
> diff -ru linux-2.5.66.orig/drivers/video/sis/sis_main.c linux-2.5.66/drivers/video/sis/sis_main.c
> --- linux-2.5.66.orig/drivers/video/sis/sis_main.c 2003-04-02 19:12:17.000000000 +0200
> +++ linux-2.5.66/drivers/video/sis/sis_main.c 2003-04-05 15:57:26.000000000 +0200
> @@ -2045,17 +2045,17 @@
>
> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
> static struct fb_ops sisfb_ops = {
> - owner: THIS_MODULE,
> - fb_get_fix: sisfb_get_fix,
> - fb_get_var: sisfb_get_var,
> - fb_set_var: sisfb_set_var,
> - fb_get_cmap: sisfb_get_cmap,
> - fb_set_cmap: sisfb_set_cmap,
> + .owner = THIS_MODULE,
> + .fb_get_fix = sisfb_get_fix,
> + .fb_get_var = sisfb_get_var,
> + .fb_set_var = sisfb_set_var,
> + .fb_get_cmap = sisfb_get_cmap,
> + .fb_set_cmap = sisfb_set_cmap,
> #ifdef SISFB_PAN
> - fb_pan_display: sisfb_pan_display,
> + .fb_pan_display = sisfb_pan_display,
> #endif
> - fb_ioctl: sisfb_ioctl,
> - fb_mmap: sisfb_mmap,
> + .fb_ioctl = sisfb_ioctl,
> + .fb_mmap = sisfb_mmap,
> };
> #endif
>
> diff -ru linux-2.5.66.orig/drivers/video/sis/sis_main.h linux-2.5.66/drivers/video/sis/sis_main.h
> --- linux-2.5.66.orig/drivers/video/sis/sis_main.h 2003-04-02 19:12:17.000000000 +0200
> +++ linux-2.5.66/drivers/video/sis/sis_main.h 2003-04-05 16:00:19.000000000 +0200
> @@ -286,43 +286,43 @@
> static int video_type = FB_TYPE_PACKED_PIXELS;
>
> static struct fb_var_screeninfo default_var = {
> - xres: 0,
> - yres: 0,
> - xres_virtual: 0,
> - yres_virtual: 0,
> - xoffset: 0,
> - yoffset: 0,
> - bits_per_pixel: 0,
> - grayscale: 0,
> - red: {0, 8, 0},
> - green: {0, 8, 0},
> - blue: {0, 8, 0},
> - transp: {0, 0, 0},
> - nonstd: 0,
> - activate: FB_ACTIVATE_NOW,
> - height: -1,
> - width: -1,
> - accel_flags: 0,
> - pixclock: 0,
> - left_margin: 0,
> - right_margin: 0,
> - upper_margin: 0,
> - lower_margin: 0,
> - hsync_len: 0,
> - vsync_len: 0,
> - sync: 0,
> - vmode: FB_VMODE_NONINTERLACED,
> + .xres = 0,
> + .yres = 0,
> + .xres_virtual = 0,
> + .yres_virtual = 0,
> + .xoffset = 0,
> + .yoffset = 0,
> + .bits_per_pixel = 0,
> + .grayscale = 0,
> + .red = {0, 8, 0},
> + .green = {0, 8, 0},
> + .blue = {0, 8, 0},
> + .transp = {0, 0, 0},
> + .nonstd = 0,
> + .activate = FB_ACTIVATE_NOW,
> + .height = -1,
> + .width = -1,
> + .accel_flags = 0,
> + .pixclock = 0,
> + .left_margin = 0,
> + .right_margin = 0,
> + .upper_margin = 0,
> + .lower_margin = 0,
> + .hsync_len = 0,
> + .vsync_len = 0,
> + .sync = 0,
> + .vmode = FB_VMODE_NONINTERLACED,
> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
> - reserved: {0, 0, 0, 0, 0, 0}
> + .reserved = {0, 0, 0, 0, 0, 0}
> #endif
> };
>
> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
> static struct fb_fix_screeninfo sisfb_fix = {
> - id: "SiS",
> - type: FB_TYPE_PACKED_PIXELS,
> - xpanstep: 1,
> - ypanstep: 1,
> + .id = "SiS",
> + .type = FB_TYPE_PACKED_PIXELS,
> + .xpanstep = 1,
> + .ypanstep = 1,
> };
> static char myid[20];
> static u32 pseudo_palette[17];
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] C99 Initialisers around scsi + ac97_codec.c
2003-04-05 14:21 [PATCH] C99 Initialisers for drivers/video Maciej Soltysiak
2003-04-05 18:51 ` James Simmons
@ 2003-04-07 19:16 ` Maciej Soltysiak
2003-04-23 12:38 ` [RESEND][PATCH] net/ipv6/netfilter warnings removal Maciej Soltysiak
1 sibling, 1 reply; 6+ messages in thread
From: Maciej Soltysiak @ 2003-04-07 19:16 UTC (permalink / raw)
To: linux-kernel; +Cc: alan
Hello,
here is a set of C99 initialisers to 2.5.66-bk13 drivers/scsi and
sound/pci/ac97/ac97_codec.c files.
drivers/scsi/3w-xxxx.c | 8 +-
drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 8 +-
drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 8 +-
drivers/scsi/gdth.h | 92 ++++++++++++++++-----------------
drivers/scsi/sym53c8xx_2/sym53c8xx.h | 32 +++++------
sound/pci/ac97/ac97_codec.c | 10 +--
6 files changed, 79 insertions(+), 79 deletions(-)
Regards,
Maciej
diff -Nru linux-2.5.66.orig/drivers/scsi/3w-xxxx.c linux-2.5.66/drivers/scsi/3w-xxxx.c
--- linux-2.5.66.orig/drivers/scsi/3w-xxxx.c 2003-04-07 20:57:44.000000000 +0200
+++ linux-2.5.66/drivers/scsi/3w-xxxx.c 2003-04-07 20:51:07.000000000 +0200
@@ -226,10 +226,10 @@
/* File operations struct for character device */
static struct file_operations tw_fops = {
- owner: THIS_MODULE,
- ioctl: tw_chrdev_ioctl,
- open: tw_chrdev_open,
- release: tw_chrdev_release
+ .owner = THIS_MODULE,
+ .ioctl = tw_chrdev_ioctl,
+ .open = tw_chrdev_open,
+ .release = tw_chrdev_release
};
/* Globals */
diff -Nru linux-2.5.66.orig/drivers/scsi/aic7xxx/aic79xx_osm_pci.c linux-2.5.66/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
--- linux-2.5.66.orig/drivers/scsi/aic7xxx/aic79xx_osm_pci.c 2003-03-05 04:29:04.000000000 +0100
+++ linux-2.5.66/drivers/scsi/aic7xxx/aic79xx_osm_pci.c 2003-04-07 20:51:04.000000000 +0200
@@ -70,10 +70,10 @@
MODULE_DEVICE_TABLE(pci, ahd_linux_pci_id_table);
struct pci_driver aic79xx_pci_driver = {
- name: "aic79xx",
- probe: ahd_linux_pci_dev_probe,
- remove: ahd_linux_pci_dev_remove,
- id_table: ahd_linux_pci_id_table
+ .name = "aic79xx",
+ .probe = ahd_linux_pci_dev_probe,
+ .remove = ahd_linux_pci_dev_remove,
+ .id_table = ahd_linux_pci_id_table
};
static void
diff -Nru linux-2.5.66.orig/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux-2.5.66/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- linux-2.5.66.orig/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2003-03-05 04:29:04.000000000 +0100
+++ linux-2.5.66/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2003-04-07 20:51:04.000000000 +0200
@@ -75,10 +75,10 @@
MODULE_DEVICE_TABLE(pci, ahc_linux_pci_id_table);
struct pci_driver aic7xxx_pci_driver = {
- name: "aic7xxx",
- probe: ahc_linux_pci_dev_probe,
- remove: ahc_linux_pci_dev_remove,
- id_table: ahc_linux_pci_id_table
+ .name = "aic7xxx",
+ .probe = ahc_linux_pci_dev_probe,
+ .remove = ahc_linux_pci_dev_remove,
+ .id_table = ahc_linux_pci_id_table
};
static void
diff -Nru linux-2.5.66.orig/drivers/scsi/gdth.h linux-2.5.66/drivers/scsi/gdth.h
--- linux-2.5.66.orig/drivers/scsi/gdth.h 2003-04-07 20:57:14.000000000 +0200
+++ linux-2.5.66/drivers/scsi/gdth.h 2003-04-07 20:51:06.000000000 +0200
@@ -1013,29 +1013,29 @@
int gdth_eh_device_reset(Scsi_Cmnd *scp);
int gdth_eh_bus_reset(Scsi_Cmnd *scp);
int gdth_eh_host_reset(Scsi_Cmnd *scp);
-#define GDTH { proc_name: "gdth", \
- proc_info: gdth_proc_info, \
- name: "GDT SCSI Disk Array Controller",\
- detect: gdth_detect, \
- release: gdth_release, \
- info: gdth_info, \
- command: NULL, \
- queuecommand: gdth_queuecommand, \
- eh_abort_handler: gdth_eh_abort, \
- eh_device_reset_handler: gdth_eh_device_reset, \
- eh_bus_reset_handler: gdth_eh_bus_reset, \
- eh_host_reset_handler: gdth_eh_host_reset, \
- abort: gdth_abort, \
- reset: gdth_reset, \
- bios_param: gdth_bios_param, \
- can_queue: GDTH_MAXCMDS, \
- this_id: -1, \
- sg_tablesize: GDTH_MAXSG, \
- cmd_per_lun: GDTH_MAXC_P_L, \
- present: 0, \
- unchecked_isa_dma: 1, \
- use_clustering: ENABLE_CLUSTERING, \
- use_new_eh_code: 1 /* use new error code */ }
+#define GDTH { .proc_name = "gdth", \
+ .proc_info = gdth_proc_info, \
+ .name = "GDT SCSI Disk Array Controller",\
+ .detect = gdth_detect, \
+ .release = gdth_release, \
+ .info = gdth_info, \
+ .command = NULL, \
+ .queuecommand = gdth_queuecommand, \
+ .eh_abort_handler = gdth_eh_abort, \
+ .eh_device_reset_handler = gdth_eh_device_reset, \
+ .eh_bus_reset_handler = gdth_eh_bus_reset, \
+ .eh_host_reset_handler = gdth_eh_host_reset, \
+ .abort = gdth_abort, \
+ .reset = gdth_reset, \
+ .bios_param = gdth_bios_param, \
+ .can_queue = GDTH_MAXCMDS, \
+ .this_id = -1, \
+ .sg_tablesize = GDTH_MAXSG, \
+ .cmd_per_lun = GDTH_MAXC_P_L, \
+ .present = 0, \
+ .unchecked_isa_dma = 1, \
+ .use_clustering = ENABLE_CLUSTERING, \
+ .use_new_eh_code = 1 /* use new error code */ }
#elif LINUX_VERSION_CODE >= 0x02015F
int gdth_bios_param(Disk *,kdev_t,int *);
@@ -1045,29 +1045,29 @@
int gdth_eh_device_reset(Scsi_Cmnd *scp);
int gdth_eh_bus_reset(Scsi_Cmnd *scp);
int gdth_eh_host_reset(Scsi_Cmnd *scp);
-#define GDTH { proc_dir: &proc_scsi_gdth, \
- proc_info: gdth_proc_info, \
- name: "GDT SCSI Disk Array Controller",\
- detect: gdth_detect, \
- release: gdth_release, \
- info: gdth_info, \
- command: NULL, \
- queuecommand: gdth_queuecommand, \
- eh_abort_handler: gdth_eh_abort, \
- eh_device_reset_handler: gdth_eh_device_reset, \
- eh_bus_reset_handler: gdth_eh_bus_reset, \
- eh_host_reset_handler: gdth_eh_host_reset, \
- abort: gdth_abort, \
- reset: gdth_reset, \
- bios_param: gdth_bios_param, \
- can_queue: GDTH_MAXCMDS, \
- this_id: -1, \
- sg_tablesize: GDTH_MAXSG, \
- cmd_per_lun: GDTH_MAXC_P_L, \
- present: 0, \
- unchecked_isa_dma: 1, \
- use_clustering: ENABLE_CLUSTERING, \
- use_new_eh_code: 1 /* use new error code */ }
+#define GDTH { .proc_dir = &proc_scsi_gdth, \
+ .proc_info = gdth_proc_info, \
+ .name = "GDT SCSI Disk Array Controller",\
+ .detect = gdth_detect, \
+ .release = gdth_release, \
+ .info = gdth_info, \
+ .command = NULL, \
+ .queuecommand = gdth_queuecommand, \
+ .eh_abort_handler = gdth_eh_abort, \
+ .eh_device_reset_handler = gdth_eh_device_reset, \
+ .eh_bus_reset_handler = gdth_eh_bus_reset, \
+ .eh_host_reset_handler = gdth_eh_host_reset, \
+ .abort = gdth_abort, \
+ .reset = gdth_reset, \
+ .bios_param = gdth_bios_param, \
+ .can_queue = GDTH_MAXCMDS, \
+ .this_id = -1, \
+ .sg_tablesize = GDTH_MAXSG, \
+ .cmd_per_lun = GDTH_MAXC_P_L, \
+ .present = 0, \
+ .unchecked_isa_dma = 1, \
+ .use_clustering = ENABLE_CLUSTERING, \
+ .use_new_eh_code = 1 /* use new error code */ }
#elif LINUX_VERSION_CODE >= 0x010300
int gdth_bios_param(Disk *,kdev_t,int *);
diff -Nru linux-2.5.66.orig/drivers/scsi/sym53c8xx_2/sym53c8xx.h linux-2.5.66/drivers/scsi/sym53c8xx_2/sym53c8xx.h
--- linux-2.5.66.orig/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2003-03-05 04:29:55.000000000 +0100
+++ linux-2.5.66/drivers/scsi/sym53c8xx_2/sym53c8xx.h 2003-04-07 20:51:05.000000000 +0200
@@ -106,22 +106,22 @@
#include <scsi/scsicam.h>
#define SYM53C8XX { \
- name: "sym53c8xx", \
- detect: sym53c8xx_detect, \
- release: sym53c8xx_release, \
- info: sym53c8xx_info, \
- queuecommand: sym53c8xx_queue_command, \
- slave_configure: sym53c8xx_slave_configure, \
- eh_abort_handler: sym53c8xx_eh_abort_handler, \
- eh_device_reset_handler:sym53c8xx_eh_device_reset_handler, \
- eh_bus_reset_handler: sym53c8xx_eh_bus_reset_handler, \
- eh_host_reset_handler: sym53c8xx_eh_host_reset_handler, \
- can_queue: 0, \
- this_id: 7, \
- sg_tablesize: 0, \
- cmd_per_lun: 0, \
- use_clustering: DISABLE_CLUSTERING, \
- highmem_io: 1}
+ .name = "sym53c8xx", \
+ .detect = sym53c8xx_detect, \
+ .release = sym53c8xx_release, \
+ .info = sym53c8xx_info, \
+ .queuecommand = sym53c8xx_queue_command, \
+ .slave_configure = sym53c8xx_slave_configure, \
+ .eh_abort_handler = sym53c8xx_eh_abort_handler, \
+ .eh_device_reset_handler:sym53c8xx_eh_device_reset_handler, \
+ .eh_bus_reset_handler = sym53c8xx_eh_bus_reset_handler, \
+ .eh_host_reset_handler = sym53c8xx_eh_host_reset_handler, \
+ .can_queue = 0, \
+ .this_id = 7, \
+ .sg_tablesize = 0, \
+ .cmd_per_lun = 0, \
+ .use_clustering = DISABLE_CLUSTERING, \
+ .highmem_io = 1}
#endif /* defined(HOSTS_C) || defined(MODULE) */
diff -Nru linux-2.5.66.orig/sound/pci/ac97/ac97_codec.c linux-2.5.66/sound/pci/ac97/ac97_codec.c
--- linux-2.5.66.orig/sound/pci/ac97/ac97_codec.c 2003-04-07 20:57:26.000000000 +0200
+++ linux-2.5.66/sound/pci/ac97/ac97_codec.c 2003-04-07 20:52:53.000000000 +0200
@@ -1058,11 +1058,11 @@
static const snd_kcontrol_new_t snd_ac97_ad1980_spdif_source =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
- info: snd_ac97_ad1980_spdif_source_info,
- get: snd_ac97_ad1980_spdif_source_get,
- put: snd_ac97_ad1980_spdif_source_put,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source",
+ .info = snd_ac97_ad1980_spdif_source_info,
+ .get = snd_ac97_ad1980_spdif_source_get,
+ .put = snd_ac97_ad1980_spdif_source_put,
};
^ permalink raw reply [flat|nested] 6+ messages in thread* [RESEND][PATCH] net/ipv6/netfilter warnings removal
2003-04-07 19:16 ` [PATCH] C99 Initialisers around scsi + ac97_codec.c Maciej Soltysiak
@ 2003-04-23 12:38 ` Maciej Soltysiak
2003-04-24 4:50 ` David S. Miller
0 siblings, 1 reply; 6+ messages in thread
From: Maciej Soltysiak @ 2003-04-23 12:38 UTC (permalink / raw)
To: linux-kernel; +Cc: alan, netfilter-devel
Hello,
There are simple warnings to remove in 4 files there, here are the
warnings:
net/ipv6/netfilter/ip6t_rt.c: In function `match':
net/ipv6/netfilter/ip6t_rt.c:133: warning: assignment from incompatible
pointer type
net/ipv6/netfilter/ip6t_frag.c: In function `match':
net/ipv6/netfilter/ip6t_frag.c:150: warning: assignment from incompatible
pointer type
net/ipv6/netfilter/ip6t_esp.c: In function `match':
net/ipv6/netfilter/ip6t_esp.c:126: warning: assignment from incompatible
pointer type
net/ipv6/netfilter/ip6t_ah.c: In function `match':
net/ipv6/netfilter/ip6t_ah.c:136: warning: assignment from incompatible
pointer type
And here is the patch to remove those by using casts.
It applies both to 2.4.20+ and 2.5.67+.
Regards,
Maciej
diff -Nru linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_ah.c linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_ah.c
--- linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_ah.c 2003-04-11 18:41:29.000000000 +0200
+++ linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_ah.c 2003-04-11 18:49:41.000000000 +0200
@@ -133,7 +133,7 @@
return 0;
}
- ah=skb->data+ptr;
+ ah = (struct ahhdr *) (skb->data + ptr);
DEBUGP("IPv6 AH LEN %u %u ", hdrlen, ah->hdrlen);
DEBUGP("RES %04X ", ah->reserved);
Binary files linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_ah.ko and linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_ah.ko differ
Binary files linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_ah.o and linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_ah.o differ
diff -Nru linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_esp.c linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_esp.c
--- linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_esp.c 2003-04-11 18:41:29.000000000 +0200
+++ linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_esp.c 2003-04-11 18:48:24.000000000 +0200
@@ -123,7 +123,7 @@
return 0;
}
- esp=skb->data+ptr;
+ esp = (struct esphdr *) (skb->data + ptr);
DEBUGP("IPv6 ESP SPI %u %08X\n", ntohl(esp->spi), ntohl(esp->spi));
Binary files linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_esp.ko and linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_esp.ko differ
Binary files linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_esp.o and linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_esp.o differ
diff -Nru linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_frag.c linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_frag.c
--- linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_frag.c 2003-04-11 18:41:29.000000000 +0200
+++ linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_frag.c 2003-04-11 18:48:09.000000000 +0200
@@ -147,7 +147,7 @@
return 0;
}
- frag=skb->data+ptr;
+ frag = (struct fraghdr *) (skb->data + ptr);
DEBUGP("IPv6 FRAG LEN %u %u ", hdrlen, frag->hdrlen);
DEBUGP("INFO %04X ", frag->info);
Binary files linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_frag.ko and linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_frag.ko differ
Binary files linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_frag.o and linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_frag.o differ
diff -Nru linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_rt.c linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_rt.c
--- linux-2.5.67-bk3.orig/net/ipv6/netfilter/ip6t_rt.c 2003-04-11 18:41:29.000000000 +0200
+++ linux-2.5.67-bk3/net/ipv6/netfilter/ip6t_rt.c 2003-04-11 18:53:36.000000000 +0200
@@ -130,7 +130,7 @@
return 0;
}
- route=skb->data+ptr;
+ route = (struct ipv6_rt_hdr *) (skb->data + ptr);
DEBUGP("IPv6 RT LEN %u %u ", hdrlen, route->hdrlen);
DEBUGP("TYPE %04X ", route->type);
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [RESEND][PATCH] net/ipv6/netfilter warnings removal
2003-04-23 12:38 ` [RESEND][PATCH] net/ipv6/netfilter warnings removal Maciej Soltysiak
@ 2003-04-24 4:50 ` David S. Miller
2003-04-27 13:12 ` Harald Welte
0 siblings, 1 reply; 6+ messages in thread
From: David S. Miller @ 2003-04-24 4:50 UTC (permalink / raw)
To: Maciej Soltysiak; +Cc: linux-kernel, alan, netfilter-devel
On Wed, 2003-04-23 at 05:38, Maciej Soltysiak wrote:
> And here is the patch to remove those by using casts.
It's kind of rediculious that these modules don't use the
existing AH/ESP/etc. header structure types (ip_auth_header et
al.)
That's why I'm not applying this patch, please fix all of these
modules up to use the same header structures as the IPSEC layer
does. Then I'll take the patch.
Thanks.
> --
> David S. Miller <davem@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [RESEND][PATCH] net/ipv6/netfilter warnings removal
2003-04-24 4:50 ` David S. Miller
@ 2003-04-27 13:12 ` Harald Welte
0 siblings, 0 replies; 6+ messages in thread
From: Harald Welte @ 2003-04-27 13:12 UTC (permalink / raw)
To: David S. Miller; +Cc: Maciej Soltysiak, linux-kernel, netfilter-devel, kisza
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
On Wed, Apr 23, 2003 at 09:50:44PM -0700, David S. Miller wrote:
> On Wed, 2003-04-23 at 05:38, Maciej Soltysiak wrote:
> > And here is the patch to remove those by using casts.
>
> It's kind of rediculious that these modules don't use the
> existing AH/ESP/etc. header structure types (ip_auth_header et
> al.)
It's because they predate any AH/ESP stuff in the linux kernel.
I'm not saying this as an excuse, just as an explanation.
Kisza: Can you work on making the changes suggested by DaveM?
> Thanks.
--
- Harald Welte <laforge@netfilter.org> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-04-27 13:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-04-05 14:21 [PATCH] C99 Initialisers for drivers/video Maciej Soltysiak
2003-04-05 18:51 ` James Simmons
2003-04-07 19:16 ` [PATCH] C99 Initialisers around scsi + ac97_codec.c Maciej Soltysiak
2003-04-23 12:38 ` [RESEND][PATCH] net/ipv6/netfilter warnings removal Maciej Soltysiak
2003-04-24 4:50 ` David S. Miller
2003-04-27 13:12 ` Harald Welte
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).