* [PATCH 1/5] block: make PCI device id constant
@ 2010-01-10 12:39 Németh Márton
0 siblings, 0 replies; 3+ messages in thread
From: Németh Márton @ 2010-01-10 12:39 UTC (permalink / raw)
To: Jens Axboe; +Cc: LKML, Julia Lawall, cocci
From: Márton Németh <nm127@freemail.hu>
The id_table field of the struct pci_driver is constant in <linux/pci.h>
so it is worth to make the initialization data also constant.
The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r@
disable decl_init,const_decl_init;
identifier I1, I2, x;
@@
struct I1 {
...
const struct I2 *x;
...
};
@s@
identifier r.I1, y;
identifier r.x, E;
@@
struct I1 y = {
.x = E,
};
@c@
identifier r.I2;
identifier s.E;
@@
const struct I2 E[] = ... ;
@depends on !c@
identifier r.I2;
identifier s.E;
@@
+ const
struct I2 E[] = ...;
// </smpl>
Signed-off-by: Márton Németh <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
---
diff -u -p a/drivers/block/DAC960.c b/drivers/block/DAC960.c
--- a/drivers/block/DAC960.c 2010-01-07 19:08:39.000000000 +0100
+++ b/drivers/block/DAC960.c 2010-01-08 09:16:28.000000000 +0100
@@ -7134,7 +7134,7 @@ static struct DAC960_privdata DAC960_P_p
.MemoryWindowSize = DAC960_PD_RegisterWindowSize,
};
-static struct pci_device_id DAC960_id_table[] = {
+static const struct pci_device_id DAC960_id_table[] = {
{
.vendor = PCI_VENDOR_ID_MYLEX,
.device = PCI_DEVICE_ID_MYLEX_DAC960_GEM,
diff -u -p a/drivers/block/sx8.c b/drivers/block/sx8.c
--- a/drivers/block/sx8.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/block/sx8.c 2010-01-08 09:27:47.000000000 +0100
@@ -409,7 +409,7 @@ static int carm_init_one (struct pci_dev
static void carm_remove_one (struct pci_dev *pdev);
static int carm_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo);
-static struct pci_device_id carm_pci_tbl[] = {
+static const struct pci_device_id carm_pci_tbl[] = {
{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
{ } /* terminate list */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/5] block: make PCI device id constant
@ 2010-01-10 14:11 Alexey Dobriyan
2010-01-10 15:41 ` Németh Márton
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Dobriyan @ 2010-01-10 14:11 UTC (permalink / raw)
To: nm127; +Cc: linux-kernel
> -static struct pci_device_id DAC960_id_table[] = {
> +static const struct pci_device_id DAC960_id_table[] = {
NAK, we have DEFINE_PCI_DEVICE_TABLE()
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/5] block: make PCI device id constant
2010-01-10 14:11 [PATCH 1/5] block: make PCI device id constant Alexey Dobriyan
@ 2010-01-10 15:41 ` Németh Márton
0 siblings, 0 replies; 3+ messages in thread
From: Németh Márton @ 2010-01-10 15:41 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: linux-kernel
From: Márton Németh <nm127@freemail.hu>
Use DEFINE_PCI_DEVICE_TABLE() when declaring the PCI device
table as suggested in Documentation/PCI/pci.txt .
Signed-off-by: Márton Németh <nm127@freemail.hu>
---
--- drivers/block/DAC960.c.orig 2010-01-10 16:12:25.000000000 +0100
+++ drivers/block/DAC960.c 2010-01-10 16:16:26.000000000 +0100
@@ -7134,7 +7134,7 @@
.MemoryWindowSize = DAC960_PD_RegisterWindowSize,
};
-static struct pci_device_id DAC960_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(DAC960_id_table) = {
{
.vendor = PCI_VENDOR_ID_MYLEX,
.device = PCI_DEVICE_ID_MYLEX_DAC960_GEM,
--- drivers/block/sx8.c.orig 2010-01-10 16:12:38.000000000 +0100
+++ drivers/block/sx8.c 2010-01-10 16:17:57.000000000 +0100
@@ -409,7 +409,7 @@
static void carm_remove_one (struct pci_dev *pdev);
static int carm_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo);
-static struct pci_device_id carm_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(carm_pci_tbl) = {
{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
{ } /* terminate list */
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-01-10 15:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-10 14:11 [PATCH 1/5] block: make PCI device id constant Alexey Dobriyan
2010-01-10 15:41 ` Németh Márton
-- strict thread matches above, loose matches on Subject: below --
2010-01-10 12:39 Németh Márton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox