[MTD] [MAPS] ck804rom: fix driver_data in probe table.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: David Woodhouse
Date: Monday, May 26, 2008 - 10:31 pm

There's a reason why using C99 initialisers even in the supposedly
trivial structs is a good idea.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 59d8fb4..effaf7c 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -331,15 +331,15 @@ static void __devexit ck804xrom_remove_one (struct pci_dev *pdev)
 }
 
 static struct pci_device_id ck804xrom_pci_tbl[] = {
-	{ PCI_VENDOR_ID_NVIDIA, 0x0051, PCI_ANY_ID, PCI_ANY_ID, DEV_CK804 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0360, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0361, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0362, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0363, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0364, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0365, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0366, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
-	{ PCI_VENDOR_ID_NVIDIA, 0x0367, PCI_ANY_ID, PCI_ANY_ID, DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0051), .driver_data = DEV_CK804 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0360), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0361), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0362), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0363), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0364), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0365), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0366), .driver_data = DEV_MCP55 },
+	{ PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, 0x0367), .driver_data = DEV_MCP55 },
 	{ 0, }
 };
 

-- 
dwmw2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Linux 2.6.26-rc4, Linus Torvalds, (Mon May 26, 11:41 am)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Mon May 26, 2:24 pm)
Re: Linux 2.6.26-rc4, Linus Torvalds, (Mon May 26, 2:42 pm)
Re: Linux 2.6.26-rc4, Arjan van de Ven, (Mon May 26, 5:25 pm)
Re: Linux 2.6.26-rc4, Arjan van de Ven, (Mon May 26, 5:31 pm)
Re: Linux 2.6.26-rc4, Carl-Daniel Hailfinger, (Mon May 26, 6:16 pm)
Re: Linux 2.6.26-rc4, Carl-Daniel Hailfinger, (Mon May 26, 6:23 pm)
Re: Linux 2.6.26-rc4, Abhijit Menon-Sen, (Mon May 26, 6:52 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Mon May 26, 10:19 pm)
2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Alexey Dobriyan, (Mon May 26, 10:23 pm)
[MTD] [MAPS] ck804rom: fix driver_data in probe table., David Woodhouse, (Mon May 26, 10:31 pm)
Re: Linux 2.6.26-rc4, David Woodhouse, (Mon May 26, 10:31 pm)
Re: Linux 2.6.26-rc4, David Woodhouse, (Mon May 26, 10:43 pm)
Re: Linux 2.6.26-rc4, Arjan van de Ven, (Mon May 26, 11:00 pm)
Re: Linux 2.6.26-rc4, David Woodhouse, (Mon May 26, 11:24 pm)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Oleg Nesterov, (Tue May 27, 2:06 am)
Re: Linux 2.6.26-rc4, J.A. , (Tue May 27, 3:01 am)
Re: Linux 2.6.26-rc4, Jeff Garzik, (Tue May 27, 3:35 am)
Re: Linux 2.6.26-rc4, Carl-Daniel Hailfinger, (Tue May 27, 3:53 am)
Re: Linux 2.6.26-rc4, Jeff Garzik, (Tue May 27, 3:54 am)
Re: Linux 2.6.26-rc4, Carl-Daniel Hailfinger, (Tue May 27, 3:58 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Linus Torvalds, (Tue May 27, 8:03 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Paul E. McKenney, (Tue May 27, 8:40 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Linus Torvalds, (Tue May 27, 9:11 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Oleg Nesterov, (Tue May 27, 9:45 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Paul E. McKenney, (Tue May 27, 10:06 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Oleg Nesterov, (Tue May 27, 10:37 am)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Alexey Dobriyan, (Tue May 27, 2:26 pm)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Paul E. McKenney, (Tue May 27, 10:01 pm)
Re: 2.6.26-rc4: RIP find_pid_ns+0x6b/0xa0, Paul E. McKenney, (Wed May 28, 12:26 am)
Re: Linux 2.6.26-rc4, Bill Davidsen, (Wed May 28, 4:59 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Tue Jun 3, 2:49 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 2:57 am)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Tue Jun 3, 3:04 am)
Re: Linux 2.6.26-rc4, Miklos Szeredi, (Tue Jun 3, 3:13 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 3:35 am)
Re: Linux 2.6.26-rc4, Miklos Szeredi, (Tue Jun 3, 3:37 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 3:40 am)
Re: Linux 2.6.26-rc4, Miklos Szeredi, (Tue Jun 3, 3:45 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 3:48 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 3:52 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 6:27 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 6:31 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 6:32 am)
Re: Linux 2.6.26-rc4, Linus Torvalds, (Tue Jun 3, 8:01 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 9:07 am)
Re: Linux 2.6.26-rc4, Linus Torvalds, (Tue Jun 3, 9:35 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 9:41 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 9:50 am)
Re: Linux 2.6.26-rc4, Linus Torvalds, (Tue Jun 3, 9:59 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:13 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:28 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 10:30 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:30 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:38 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 10:41 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:41 am)
Re: Linux 2.6.26-rc4, Jeff Moyer, (Tue Jun 3, 10:46 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:49 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 10:50 am)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 12:18 pm)
Re: Linux 2.6.26-rc4, Jeff Moyer, (Tue Jun 3, 12:53 pm)
Re: Linux 2.6.26-rc4, Al Viro, (Tue Jun 3, 4:00 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 6:36 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 7:42 pm)
Re: Linux 2.6.26-rc4, Miklos Szeredi, (Tue Jun 3, 10:34 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 3, 10:41 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Wed Jun 4, 10:51 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Thu Jun 5, 12:31 am)
Re: Linux 2.6.26-rc4, Linus Torvalds, (Thu Jun 5, 2:29 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Thu Jun 5, 2:34 pm)
Re: Linux 2.6.26-rc4, Andrew Morton, (Thu Jun 5, 3:30 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Thu Jun 5, 7:39 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Thu Jun 5, 7:47 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Thu Jun 5, 11:23 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Fri Jun 6, 1:21 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Fri Jun 6, 1:25 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Mon Jun 9, 9:57 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Mon Jun 9, 11:28 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Mon Jun 9, 11:40 pm)
Re: Linux 2.6.26-rc4, Ian Kent, (Tue Jun 10, 2:09 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Wed Jun 11, 8:03 pm)
Re: Linux 2.6.26-rc4, Jesper Krogh, (Thu Jun 12, 12:02 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Thu Jun 12, 4:19 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Thu Jun 12, 4:21 am)
Re: Linux 2.6.26-rc4, Ian Kent, (Thu Jun 26, 9:18 pm)