diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-07-03 12:02:28 -0400 |
---|---|---|
committer | Ben Collins <bcollins@ubuntu.com> | 2006-07-03 12:02:28 -0400 |
commit | e1d118f16dca0f54faba3e8dd5b6adbbf7ac68c8 (patch) | |
tree | fffc9d2b1fbe3fe6bb55758e2a6951ad9c581e63 /drivers/ieee1394/ieee1394_core.h | |
parent | 2b01b80b944b3abf623c8acc2b5537a85b5ebd3c (diff) |
[PATCH] ieee1394: coding style and comment fixes in midlayer header files
Adjust tabulators, line wraps, empty lines, and comment style.
Update comments in ieee1394_transactions.h and highlevel.h.
Fix typo in comment in csr.h.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/ieee1394/ieee1394_core.h')
-rw-r--r-- | drivers/ieee1394/ieee1394_core.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/ieee1394/ieee1394_core.h b/drivers/ieee1394/ieee1394_core.h index 0ecbf335c64..31d9efccdc0 100644 --- a/drivers/ieee1394/ieee1394_core.h +++ b/drivers/ieee1394/ieee1394_core.h | |||
@@ -58,7 +58,6 @@ struct hpsb_packet { | |||
58 | size_t header_size; | 58 | size_t header_size; |
59 | size_t data_size; | 59 | size_t data_size; |
60 | 60 | ||
61 | |||
62 | struct hpsb_host *host; | 61 | struct hpsb_host *host; |
63 | unsigned int generation; | 62 | unsigned int generation; |
64 | 63 | ||
@@ -80,7 +79,7 @@ struct hpsb_packet { | |||
80 | 79 | ||
81 | /* Set a task for when a packet completes */ | 80 | /* Set a task for when a packet completes */ |
82 | void hpsb_set_packet_complete_task(struct hpsb_packet *packet, | 81 | void hpsb_set_packet_complete_task(struct hpsb_packet *packet, |
83 | void (*routine)(void *), void *data); | 82 | void (*routine)(void *), void *data); |
84 | 83 | ||
85 | static inline struct hpsb_packet *driver_packet(struct list_head *l) | 84 | static inline struct hpsb_packet *driver_packet(struct list_head *l) |
86 | { | 85 | { |
@@ -92,7 +91,6 @@ void abort_timedouts(unsigned long __opaque); | |||
92 | struct hpsb_packet *hpsb_alloc_packet(size_t data_size); | 91 | struct hpsb_packet *hpsb_alloc_packet(size_t data_size); |
93 | void hpsb_free_packet(struct hpsb_packet *packet); | 92 | void hpsb_free_packet(struct hpsb_packet *packet); |
94 | 93 | ||
95 | |||
96 | /* | 94 | /* |
97 | * Generation counter for the complete 1394 subsystem. Generation gets | 95 | * Generation counter for the complete 1394 subsystem. Generation gets |
98 | * incremented on every change in the subsystem (e.g. bus reset). | 96 | * incremented on every change in the subsystem (e.g. bus reset). |
@@ -204,10 +202,14 @@ void hpsb_packet_received(struct hpsb_host *host, quadlet_t *data, size_t size, | |||
204 | #define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15 | 202 | #define IEEE1394_MINOR_BLOCK_EXPERIMENTAL 15 |
205 | 203 | ||
206 | #define IEEE1394_CORE_DEV MKDEV(IEEE1394_MAJOR, 0) | 204 | #define IEEE1394_CORE_DEV MKDEV(IEEE1394_MAJOR, 0) |
207 | #define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16) | 205 | #define IEEE1394_RAW1394_DEV MKDEV(IEEE1394_MAJOR, \ |
208 | #define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_VIDEO1394 * 16) | 206 | IEEE1394_MINOR_BLOCK_RAW1394 * 16) |
209 | #define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16) | 207 | #define IEEE1394_VIDEO1394_DEV MKDEV(IEEE1394_MAJOR, \ |
210 | #define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16) | 208 | IEEE1394_MINOR_BLOCK_VIDEO1394 * 16) |
209 | #define IEEE1394_DV1394_DEV MKDEV(IEEE1394_MAJOR, \ | ||
210 | IEEE1394_MINOR_BLOCK_DV1394 * 16) | ||
211 | #define IEEE1394_EXPERIMENTAL_DEV MKDEV(IEEE1394_MAJOR, \ | ||
212 | IEEE1394_MINOR_BLOCK_EXPERIMENTAL * 16) | ||
211 | 213 | ||
212 | /* return the index (within a minor number block) of a file */ | 214 | /* return the index (within a minor number block) of a file */ |
213 | static inline unsigned char ieee1394_file_to_instance(struct file *file) | 215 | static inline unsigned char ieee1394_file_to_instance(struct file *file) |
@@ -223,4 +225,3 @@ extern struct class hpsb_host_class; | |||
223 | extern struct class *hpsb_protocol_class; | 225 | extern struct class *hpsb_protocol_class; |
224 | 226 | ||
225 | #endif /* _IEEE1394_CORE_H */ | 227 | #endif /* _IEEE1394_CORE_H */ |
226 | |||