diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-15 17:11:38 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 15:56:53 -0400 |
commit | c64094684dad4a903099f1ff83b7db9b62782adc (patch) | |
tree | a2f5c78ecf4aeb3662fab0868fe32ed96bb62c57 | |
parent | 421696887b0da241401710e83b0dffcc195bc484 (diff) |
ieee1394: constify device ID tables
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r-- | drivers/ieee1394/dv1394.c | 2 | ||||
-rw-r--r-- | drivers/ieee1394/eth1394.c | 2 | ||||
-rw-r--r-- | drivers/ieee1394/nodemgr.c | 4 | ||||
-rw-r--r-- | drivers/ieee1394/nodemgr.h | 2 | ||||
-rw-r--r-- | drivers/ieee1394/raw1394.c | 2 | ||||
-rw-r--r-- | drivers/ieee1394/sbp2.c | 2 | ||||
-rw-r--r-- | drivers/ieee1394/video1394.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 3838bc4acaba..4c2c02572d21 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
@@ -2175,7 +2175,7 @@ static const struct file_operations dv1394_fops= | |||
2175 | * Export information about protocols/devices supported by this driver. | 2175 | * Export information about protocols/devices supported by this driver. |
2176 | */ | 2176 | */ |
2177 | #ifdef MODULE | 2177 | #ifdef MODULE |
2178 | static struct ieee1394_device_id dv1394_id_table[] = { | 2178 | static const struct ieee1394_device_id dv1394_id_table[] = { |
2179 | { | 2179 | { |
2180 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 2180 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
2181 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, | 2181 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, |
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 0ed0f80c7cbb..4ca103577c0a 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -438,7 +438,7 @@ static int eth1394_update(struct unit_directory *ud) | |||
438 | return eth1394_new_node(hi, ud); | 438 | return eth1394_new_node(hi, ud); |
439 | } | 439 | } |
440 | 440 | ||
441 | static struct ieee1394_device_id eth1394_id_table[] = { | 441 | static const struct ieee1394_device_id eth1394_id_table[] = { |
442 | { | 442 | { |
443 | .match_flags = (IEEE1394_MATCH_SPECIFIER_ID | | 443 | .match_flags = (IEEE1394_MATCH_SPECIFIER_ID | |
444 | IEEE1394_MATCH_VERSION), | 444 | IEEE1394_MATCH_VERSION), |
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 53aada5bbe1e..a6d55bebe61a 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
@@ -484,7 +484,7 @@ static struct device_attribute *const fw_host_attrs[] = { | |||
484 | static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf) | 484 | static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf) |
485 | { | 485 | { |
486 | struct hpsb_protocol_driver *driver; | 486 | struct hpsb_protocol_driver *driver; |
487 | struct ieee1394_device_id *id; | 487 | const struct ieee1394_device_id *id; |
488 | int length = 0; | 488 | int length = 0; |
489 | char *scratch = buf; | 489 | char *scratch = buf; |
490 | 490 | ||
@@ -658,7 +658,7 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) | |||
658 | { | 658 | { |
659 | struct hpsb_protocol_driver *driver; | 659 | struct hpsb_protocol_driver *driver; |
660 | struct unit_directory *ud; | 660 | struct unit_directory *ud; |
661 | struct ieee1394_device_id *id; | 661 | const struct ieee1394_device_id *id; |
662 | 662 | ||
663 | /* We only match unit directories */ | 663 | /* We only match unit directories */ |
664 | if (dev->platform_data != &nodemgr_ud_platform_data) | 664 | if (dev->platform_data != &nodemgr_ud_platform_data) |
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h index ee5acdbd114a..749b271d3107 100644 --- a/drivers/ieee1394/nodemgr.h +++ b/drivers/ieee1394/nodemgr.h | |||
@@ -125,7 +125,7 @@ struct hpsb_protocol_driver { | |||
125 | * probe function below can implement further protocol | 125 | * probe function below can implement further protocol |
126 | * dependent or vendor dependent checking. | 126 | * dependent or vendor dependent checking. |
127 | */ | 127 | */ |
128 | struct ieee1394_device_id *id_table; | 128 | const struct ieee1394_device_id *id_table; |
129 | 129 | ||
130 | /* | 130 | /* |
131 | * The update function is called when the node has just | 131 | * The update function is called when the node has just |
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 9b71390b0a0b..da5f8829b503 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c | |||
@@ -2982,7 +2982,7 @@ static int raw1394_release(struct inode *inode, struct file *file) | |||
2982 | * Export information about protocols/devices supported by this driver. | 2982 | * Export information about protocols/devices supported by this driver. |
2983 | */ | 2983 | */ |
2984 | #ifdef MODULE | 2984 | #ifdef MODULE |
2985 | static struct ieee1394_device_id raw1394_id_table[] = { | 2985 | static const struct ieee1394_device_id raw1394_id_table[] = { |
2986 | { | 2986 | { |
2987 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 2987 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
2988 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, | 2988 | .specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, |
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 092fbf087b08..a51ab233342d 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -285,7 +285,7 @@ static const struct hpsb_address_ops sbp2_physdma_ops = { | |||
285 | /* | 285 | /* |
286 | * Interface to driver core and IEEE 1394 core | 286 | * Interface to driver core and IEEE 1394 core |
287 | */ | 287 | */ |
288 | static struct ieee1394_device_id sbp2_id_table[] = { | 288 | static const struct ieee1394_device_id sbp2_id_table[] = { |
289 | { | 289 | { |
290 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 290 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
291 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, | 291 | .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, |
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 679a918a5cc7..d287ba79821d 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c | |||
@@ -1294,7 +1294,7 @@ static const struct file_operations video1394_fops= | |||
1294 | * Export information about protocols/devices supported by this driver. | 1294 | * Export information about protocols/devices supported by this driver. |
1295 | */ | 1295 | */ |
1296 | #ifdef MODULE | 1296 | #ifdef MODULE |
1297 | static struct ieee1394_device_id video1394_id_table[] = { | 1297 | static const struct ieee1394_device_id video1394_id_table[] = { |
1298 | { | 1298 | { |
1299 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, | 1299 | .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, |
1300 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, | 1300 | .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, |