Skip to contentSkip to conversation

C99 initializers for drivers/ide/pci (1 of 2), take 2

PATCH New Art Haas 1 participant 1 message Nov 11, 2002

lore
Share & tools
lore

Art Haas

author
#0 lore raw

PATCH 1/1 C99 initializers for drivers/ide/pci (1 of 2), take 2

Hi.

Here's a new set of patches for drivers/ide/pci that switch the files to use C99 initializers. I've removed the lines that initialize variables to NULL or 0. The patch is against 2.5.47.

This patch is for the files starting with [a-n].

Art Haas

drivers/ide/pci/adma100.h renamed from drivers/ide/pci/adma100.h.old +12 -17
@@ -12,24 +12,19 @@
 
 static ide_pci_device_t pdcadma_chipsets[] __devinitdata = {
 	{
-		vendor:	PCI_VENDOR_ID_PDC,
-		device:	PCI_DEVICE_ID_PDC_1841,
-		name:		"ADMA100",
-		init_setup:	init_setup_pdcadma,
-		init_chipset:	init_chipset_pdcadma,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_pdcadma,
-		init_dma:	init_dma_pdcadma,
-		channels:	2,
-		autodma:	NODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	OFF_BOARD,
-		extra:		0
+		.vendor		= PCI_VENDOR_ID_PDC,
+		.device		= PCI_DEVICE_ID_PDC_1841,
+		.name		= "ADMA100",
+		.init_setup	= init_setup_pdcadma,
+		.init_chipset	= init_chipset_pdcadma,
+		.init_hwif	= init_hwif_pdcadma,
+		.init_dma	= init_dma_pdcadma,
+		.channels	= 2,
+		.autodma	= NODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= OFF_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 }
drivers/ide/pci/aec62xx.h renamed from drivers/ide/pci/aec62xx.h.old +58 -69

143 lines not on this page · raw message

drivers/ide/pci/alim15x3.h renamed from drivers/ide/pci/alim15x3.h.old +14 -20
@@ -17,10 +17,9 @@
 
 static ide_pci_host_proc_t ali_procs[] __initdata = {
 	{
-		name:		"ali",
-		set:		1,
-		get_info:	ali_get_info,
-		parent:		NULL,
+		.name		= "ali",
+		.set		= 1,
+		.get_info	= ali_get_info,
 	},
 };
 #endif /* DISPLAY_ALI_TIMINGS && CONFIG_PROC_FS */

@@ -32,23 +31,18 @@
 
 static ide_pci_device_t ali15x3_chipsets[] __devinitdata = {
 	{	/* 0 */
-		vendor:		PCI_VENDOR_ID_AL,
-		device:		PCI_DEVICE_ID_AL_M5229,
-		name:		"ALI15X3",
-		init_chipset:	init_chipset_ali15x3,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_ali15x3,
-		init_dma:	init_dma_ali15x3,
-		channels:	2,
-		autodma:	AUTODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	ON_BOARD,
-		extra:		0
+		.vendor		= PCI_VENDOR_ID_AL,
+		.device		= PCI_DEVICE_ID_AL_M5229,
+		.name		= "ALI15X3",
+		.init_chipset	= init_chipset_ali15x3,
+		.init_hwif	= init_hwif_ali15x3,
+		.init_dma	= init_dma_ali15x3,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= ON_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 };
drivers/ide/pci/amd74xx.h renamed from drivers/ide/pci/amd74xx.h.old +54 -68

139 lines not on this page · raw message

drivers/ide/pci/cmd640.h renamed from drivers/ide/pci/cmd640.h.old +9 -16
@@ -9,23 +9,16 @@
 
 static ide_pci_device_t cmd640_chipsets[] __initdata = {
 	{
-		vendor:		PCI_VENDOR_ID_CMD,
-		device:		PCI_DEVICE_ID_CMD_640,
-		name:		"CMD640",
-		init_setup:	NULL,
-		init_chipset:	NULL,
-		init_iops:	NULL,
-		init_hwif:	IDE_IGNORE,
-		init_dma:	NULL,
-		channels:	2,
-		autodma:	NODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	ON_BOARD,
-		extra:		0
+		.vendor		= PCI_VENDOR_ID_CMD,
+		.device		= PCI_DEVICE_ID_CMD_640,
+		.name		= "CMD640",
+		.init_hwif	= IDE_IGNORE,
+		.channels	= 2,
+		.autodma	= NODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= ON_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 }
drivers/ide/pci/cmd64x.h renamed from drivers/ide/pci/cmd64x.h.old +45 -56

117 lines not on this page · raw message

drivers/ide/pci/cs5530.h renamed from drivers/ide/pci/cs5530.h.old +14 -20
@@ -17,10 +17,9 @@
 
 static ide_pci_host_proc_t cs5530_procs[] __initdata = {
 	{
-		name:		"cs5530",
-		set:		1,
-		get_info:	cs5530_get_info,
-		parent:		NULL,
+		.name		= "cs5530",
+		.set		= 1,
+		.get_info	= cs5530_get_info,
 	},
 };
 #endif /* DISPLAY_CS5530_TIMINGS && CONFIG_PROC_FS */

@@ -31,23 +30,18 @@
 
 static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
 	{	/* 0 */
-		vendor:		PCI_VENDOR_ID_CYRIX,
-		device:		PCI_DEVICE_ID_CYRIX_5530_IDE,
-		name:		"CS5530",
-		init_chipset:	init_chipset_cs5530,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_cs5530,
-		init_dma:	init_dma_cs5530,
-		channels:	2,
-		autodma:	AUTODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	ON_BOARD,
-		extra:		0,
+		.vendor		= PCI_VENDOR_ID_CYRIX,
+		.device		= PCI_DEVICE_ID_CYRIX_5530_IDE,
+		.name		= "CS5530",
+		.init_chipset	= init_chipset_cs5530,
+		.init_hwif	= init_hwif_cs5530,
+		.init_dma	= init_dma_cs5530,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= ON_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 };
drivers/ide/pci/cy82c693.h renamed from drivers/ide/pci/cy82c693.h.old +11 -16
@@ -70,23 +70,18 @@
 
 static ide_pci_device_t cy82c693_chipsets[] __devinitdata = {
 	{	/* 0 */
-		vendor:		PCI_VENDOR_ID_CONTAQ,
-		device:		PCI_DEVICE_ID_CONTAQ_82C693,
-		name:		"CY82C693",
-		init_chipset:	init_chipset_cy82c693,
-		init_iops:	init_iops_cy82c693,
-		init_hwif:	init_hwif_cy82c693,
-		init_dma:	NULL,
-		channels:	1,
-		autodma:	AUTODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	ON_BOARD,
-		extra:		0,
+		.vendor		= PCI_VENDOR_ID_CONTAQ,
+		.device		= PCI_DEVICE_ID_CONTAQ_82C693,
+		.name		= "CY82C693",
+		.init_chipset	= init_chipset_cy82c693,
+		.init_iops	= init_iops_cy82c693,
+		.init_hwif	= init_hwif_cy82c693,
+		.channels	= 1,
+		.autodma	= AUTODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= ON_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 };
drivers/ide/pci/generic.h renamed from drivers/ide/pci/generic.h.old +100 -128

249 lines not on this page · raw message

drivers/ide/pci/hpt34x.h renamed from drivers/ide/pci/hpt34x.h.old +15 -20
@@ -23,10 +23,9 @@
 
 static ide_pci_host_proc_t hpt34x_procs[] __initdata = {
 	{
-		name:		"hpt34x",
-		set:		1,
-		get_info:	hpt34x_get_info,
-		parent:		NULL,
+		.name		= "hpt34x",
+		.set		= 1,
+		.get_info	= hpt34x_get_info,
 	},
 };
 #endif  /* defined(DISPLAY_HPT34X_TIMINGS) && defined(CONFIG_PROC_FS) */

@@ -37,23 +36,19 @@
 
 static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
 	{	/* 0 */
-		vendor:		PCI_VENDOR_ID_TTI,
-		device:		PCI_DEVICE_ID_TTI_HPT343,
-		name:		"HPT34X",
-		init_chipset:	init_chipset_hpt34x,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_hpt34x,
-		init_dma:	init_dma_hpt34x,
-		channels:	2,
-		autodma:	NOAUTODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	NEVER_BOARD,
-		extra:		16
+		.vendor		= PCI_VENDOR_ID_TTI,
+		.device		= PCI_DEVICE_ID_TTI_HPT343,
+		.name		= "HPT34X",
+		.init_chipset	= init_chipset_hpt34x,
+		.init_hwif	= init_hwif_hpt34x,
+		.init_dma	= init_dma_hpt34x,
+		.channels	= 2,
+		.autodma	= NOAUTODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= NEVER_BOARD,
+		.extra		= 16
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 };
drivers/ide/pci/hpt366.h renamed from drivers/ide/pci/hpt366.h.old +60 -73

150 lines not on this page · raw message

drivers/ide/pci/it8172.h renamed from drivers/ide/pci/it8172.h.old +12 -17
@@ -21,24 +21,19 @@
 
 static ide_pci_device_t it8172_chipsets[] __devinitdata = {
 	{	/* 0 */
-		vendor:		PCI_VENDOR_ID_ITE,
-		device:		PCI_DEVICE_ID_ITE_IT8172G,
-		name:		"IT8172G",
-		init_setup:	init_setup_it8172,
-		init_chipset:	init_chipset_it8172,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_it8172,
-                init_dma:	init_dma_it8172,
-		channels:	2,
-		autodma:	AUTODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x40,0x00,0x01}},
-		bootable:	ON_BOARD,
-		extra:		0,
+		.vendor		= PCI_VENDOR_ID_ITE,
+		.device		= PCI_DEVICE_ID_ITE_IT8172G,
+		.name		= "IT8172G",
+		.init_setup	= init_setup_it8172,
+		.init_chipset	= init_chipset_it8172,
+		.init_hwif	= init_hwif_it8172,
+                .init_dma	= init_dma_it8172,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x40,0x00,0x01}},
+		.bootable	= ON_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 };
drivers/ide/pci/ns87415.h renamed from drivers/ide/pci/ns87415.h.old +10 -16
@@ -10,23 +10,17 @@
 
 static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
 	{	/* 0 */
-		vendor:		PCI_VENDOR_ID_NS,
-		device:		PCI_DEVICE_ID_NS_87415,
-		name:		"NS87415",
-		init_chipset:	NULL,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_ns87415,
-                init_dma:	init_dma_ns87415,
-		channels:	2,
-		autodma:	AUTODMA,
-		enablebits:	{{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-		bootable:	ON_BOARD,
-		extra:		0,
+		.vendor		= PCI_VENDOR_ID_NS,
+		.device		= PCI_DEVICE_ID_NS_87415,
+		.name		= "NS87415",
+		.init_hwif	= init_hwif_ns87415,
+		.init_dma	= init_dma_ns87415,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+		.bootable	= ON_BOARD,
 	},{
-		vendor:		0,
-		device:		0,
-		channels:	0,
-		bootable:	EOL,
+		.bootable	= EOL,
 	}
 };
drivers/ide/pci/nvidia.h renamed from drivers/ide/pci/nvidia.h.old +13 -16
@@ -17,10 +17,9 @@
 
 static ide_pci_host_proc_t nforce_procs[] __initdata = {
 	{
-		name:		"nforce",
-		set:		1,
-		get_info:	nforce_get_info,
-		parent:		NULL,
+		.name		= "nforce",
+		.set		= 1,
+		.get_info	= nforce_get_info,
 	},
 };
 #endif  /* defined(DISPLAY_NFORCE_TIMINGS) && defined(CONFIG_PROC_FS) */

@@ -31,18 +30,16 @@
 
 static ide_pci_device_t nvidia_chipsets[] __devinitdata = {
 	{
-		vendor:		PCI_VENDOR_ID_NVIDIA,
-		device:		PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,
-		name:		"NFORCE",
-		init_chipset:	init_chipset_nforce,
-		init_iops:	NULL,
-		init_hwif:	init_hwif_nforce,
-		init_dma:	init_dma_nforce,
-		channels:	2,
-		autodma:	AUTODMA,
-		enablebits:	{{0x50,0x01,0x01}, {0x50,0x02,0x02}},
-		bootable:	ON_BOARD,
-		extra:		0,
+		.vendor		= PCI_VENDOR_ID_NVIDIA,
+		.device		= PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,
+		.name		= "NFORCE",
+		.init_chipset	= init_chipset_nforce,
+		.init_hwif	= init_hwif_nforce,
+		.init_dma	= init_dma_nforce,
+		.channels	= 2,
+		.autodma	= AUTODMA,
+		.enablebits	= {{0x50,0x01,0x01}, {0x50,0x02,0x02}},
+		.bootable	= ON_BOARD,
 	}
 };
Signature · 3 lines
They that can give up essential liberty to obtain a little temporary safety
deserve neither liberty nor safety.
 -- Benjamin Franklin, Historical Review of Pennsylvania, 1759