redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

firewire: mark some structs const

Browse source 
Instances of struct file_operations and struct fw_card_driver can be
qualified as "const".  Ditto with struct fw_descriptor.data, struct
fw_device_id, and predefined instances of struct fw_address_region,
at least in the current implementation.

Data qualified as const is placed into the .rodata section which won't
be mixed with dirty data.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2007-01-14 15:29:07 +01:00
parent 227e7d8194
commit 21ebcd1224
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/firewire/fw-card.c
View file

@ -257,7 +257,7 @@ flush_timer_callback(unsigned long data)
} }
void void
fw_card_initialize(struct fw_card *card, struct fw_card_driver *driver, fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
struct device *device) struct device *device)
{ {
static int index; static int index;

2
drivers/firewire/fw-device-cdev.c
View file

@ -602,7 +602,7 @@ static unsigned int fw_device_op_poll(struct file *file, poll_table * pt)
return 0; return 0;
} }
struct file_operations fw_device_ops = { const struct file_operations fw_device_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = fw_device_op_open, .open = fw_device_op_open,
.read = fw_device_op_read, .read = fw_device_op_read,

2
drivers/firewire/fw-device.c
View file

@ -49,7 +49,7 @@ EXPORT_SYMBOL(fw_csr_iterator_next);
static int is_fw_unit(struct device *dev); static int is_fw_unit(struct device *dev);
static int match_unit_directory(u32 * directory, struct fw_device_id *id) static int match_unit_directory(u32 * directory, const struct fw_device_id *id)
{ {
struct fw_csr_iterator ci; struct fw_csr_iterator ci;
int key, value, match; int key, value, match;

4
drivers/firewire/fw-device.h
View file

@ -113,7 +113,7 @@ struct fw_driver {
struct device_driver driver; struct device_driver driver;
/* Called when the parent device sits through a bus reset. */ /* Called when the parent device sits through a bus reset. */
void (*update) (struct fw_unit *unit); void (*update) (struct fw_unit *unit);
struct fw_device_id *id_table; const struct fw_device_id *id_table;
}; };
static inline struct fw_driver * static inline struct fw_driver *
@ -122,6 +122,6 @@ fw_driver(struct device_driver *drv)
return container_of(drv, struct fw_driver, driver); return container_of(drv, struct fw_driver, driver);
} }
extern struct file_operations fw_device_ops; extern const struct file_operations fw_device_ops;
#endif /* __fw_device_h */ #endif /* __fw_device_h */

2
drivers/firewire/fw-ohci.c
View file

@ -1146,7 +1146,7 @@ ohci_queue_iso(struct fw_iso_context *base,
return 0; return 0;
} }
static struct fw_card_driver ohci_driver = { static const struct fw_card_driver ohci_driver = {
.name = ohci_driver_name, .name = ohci_driver_name,
.enable = ohci_enable, .enable = ohci_enable,
.update_phy_reg = ohci_update_phy_reg, .update_phy_reg = ohci_update_phy_reg,

2
drivers/firewire/fw-sbp2.c
View file

@ -681,7 +681,7 @@ static void sbp2_update(struct fw_unit *unit)
#define SBP2_UNIT_SPEC_ID_ENTRY 0x0000609e #define SBP2_UNIT_SPEC_ID_ENTRY 0x0000609e
#define SBP2_SW_VERSION_ENTRY 0x00010483 #define SBP2_SW_VERSION_ENTRY 0x00010483
static struct fw_device_id sbp2_id_table[] = { static const struct fw_device_id sbp2_id_table[] = {
{ {
.match_flags = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION, .match_flags = FW_MATCH_SPECIFIER_ID | FW_MATCH_VERSION,
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY,

14
drivers/firewire/fw-transaction.c
View file

@ -331,15 +331,15 @@ lookup_enclosing_address_handler(struct list_head *list,
static DEFINE_SPINLOCK(address_handler_lock); static DEFINE_SPINLOCK(address_handler_lock);
static LIST_HEAD(address_handler_list); static LIST_HEAD(address_handler_list);
struct fw_address_region fw_low_memory_region = const struct fw_address_region fw_low_memory_region =
{ 0x000000000000ull, 0x000100000000ull }; { 0x000000000000ull, 0x000100000000ull };
struct fw_address_region fw_high_memory_region = const struct fw_address_region fw_high_memory_region =
{ 0x000100000000ull, 0xffffe0000000ull }; { 0x000100000000ull, 0xffffe0000000ull };
struct fw_address_region fw_private_region = const struct fw_address_region fw_private_region =
{ 0xffffe0000000ull, 0xfffff0000000ull }; { 0xffffe0000000ull, 0xfffff0000000ull };
struct fw_address_region fw_csr_region = const struct fw_address_region fw_csr_region =
{ 0xfffff0000000ULL, 0xfffff0000800ull }; { 0xfffff0000000ULL, 0xfffff0000800ull };
struct fw_address_region fw_unit_space_region = const struct fw_address_region fw_unit_space_region =
{ 0xfffff0000900ull, 0x1000000000000ull }; { 0xfffff0000900ull, 0x1000000000000ull };
EXPORT_SYMBOL(fw_low_memory_region); EXPORT_SYMBOL(fw_low_memory_region);
@ -358,7 +358,7 @@ EXPORT_SYMBOL(fw_unit_space_region);
int int
fw_core_add_address_handler(struct fw_address_handler *handler, fw_core_add_address_handler(struct fw_address_handler *handler,
struct fw_address_region *region) const struct fw_address_region *region)
{ {
struct fw_address_handler *other; struct fw_address_handler *other;
unsigned long flags; unsigned long flags;
@ -684,7 +684,7 @@ MODULE_AUTHOR("Kristian Hoegsberg <krh@bitplanet.net>");
MODULE_DESCRIPTION("Core IEEE1394 transaction logic"); MODULE_DESCRIPTION("Core IEEE1394 transaction logic");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static u32 vendor_textual_descriptor_data[] = { static const u32 vendor_textual_descriptor_data[] = {
/* textual descriptor leaf () */ /* textual descriptor leaf () */
0x00080000, 0x00080000,
0x00000000, 0x00000000,

18
drivers/firewire/fw-transaction.h
View file

@ -133,7 +133,7 @@ struct fw_descriptor {
struct list_head link; struct list_head link;
size_t length; size_t length;
u32 key; u32 key;
u32 *data; const u32 *data;
}; };
int fw_core_add_descriptor (struct fw_descriptor *desc); int fw_core_add_descriptor (struct fw_descriptor *desc);
@ -218,14 +218,14 @@ struct fw_address_region {
u64 end; u64 end;
}; };
extern struct fw_address_region fw_low_memory_region; extern const struct fw_address_region fw_low_memory_region;
extern struct fw_address_region fw_high_memory_region; extern const struct fw_address_region fw_high_memory_region;
extern struct fw_address_region fw_private_region; extern const struct fw_address_region fw_private_region;
extern struct fw_address_region fw_csr_region; extern const struct fw_address_region fw_csr_region;
extern struct fw_address_region fw_unit_space_region; extern const struct fw_address_region fw_unit_space_region;
int fw_core_add_address_handler(struct fw_address_handler *handler, int fw_core_add_address_handler(struct fw_address_handler *handler,
struct fw_address_region *region); const struct fw_address_region *region);
void fw_core_remove_address_handler(struct fw_address_handler *handler); void fw_core_remove_address_handler(struct fw_address_handler *handler);
void fw_send_response(struct fw_card *card, void fw_send_response(struct fw_card *card,
struct fw_request *request, int rcode); struct fw_request *request, int rcode);
@ -233,7 +233,7 @@ void fw_send_response(struct fw_card *card,
extern struct bus_type fw_bus_type; extern struct bus_type fw_bus_type;
struct fw_card { struct fw_card {
struct fw_card_driver *driver; const struct fw_card_driver *driver;
struct device *device; struct device *device;
int node_id; int node_id;
@ -399,7 +399,7 @@ fw_node_event(struct fw_card *card, struct fw_node *node, int event);
/* Do we need phy speed here also? If we add more args, maybe we /* Do we need phy speed here also? If we add more args, maybe we
should go back to struct fw_card_info. */ should go back to struct fw_card_info. */
void void
fw_card_initialize(struct fw_card *card, struct fw_card_driver *driver, fw_card_initialize(struct fw_card *card, const struct fw_card_driver *driver,
struct device *device); struct device *device);
int int
fw_card_add(struct fw_card *card, fw_card_add(struct fw_card *card,