diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/list.h | 34 | ||||
| -rw-r--r-- | include/linux/mod_devicetable.h | 2 | ||||
| -rw-r--r-- | include/linux/plist.h | 10 | ||||
| -rw-r--r-- | include/linux/rculist.h | 8 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 2 |
5 files changed, 28 insertions, 28 deletions
diff --git a/include/linux/list.h b/include/linux/list.h index f33f831eb3c8..feb773c76ee0 100644 --- a/include/linux/list.h +++ b/include/linux/list.h | |||
| @@ -346,7 +346,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 346 | * list_entry - get the struct for this entry | 346 | * list_entry - get the struct for this entry |
| 347 | * @ptr: the &struct list_head pointer. | 347 | * @ptr: the &struct list_head pointer. |
| 348 | * @type: the type of the struct this is embedded in. | 348 | * @type: the type of the struct this is embedded in. |
| 349 | * @member: the name of the list_struct within the struct. | 349 | * @member: the name of the list_head within the struct. |
| 350 | */ | 350 | */ |
| 351 | #define list_entry(ptr, type, member) \ | 351 | #define list_entry(ptr, type, member) \ |
| 352 | container_of(ptr, type, member) | 352 | container_of(ptr, type, member) |
| @@ -355,7 +355,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 355 | * list_first_entry - get the first element from a list | 355 | * list_first_entry - get the first element from a list |
| 356 | * @ptr: the list head to take the element from. | 356 | * @ptr: the list head to take the element from. |
| 357 | * @type: the type of the struct this is embedded in. | 357 | * @type: the type of the struct this is embedded in. |
| 358 | * @member: the name of the list_struct within the struct. | 358 | * @member: the name of the list_head within the struct. |
| 359 | * | 359 | * |
| 360 | * Note, that list is expected to be not empty. | 360 | * Note, that list is expected to be not empty. |
| 361 | */ | 361 | */ |
| @@ -366,7 +366,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 366 | * list_last_entry - get the last element from a list | 366 | * list_last_entry - get the last element from a list |
| 367 | * @ptr: the list head to take the element from. | 367 | * @ptr: the list head to take the element from. |
| 368 | * @type: the type of the struct this is embedded in. | 368 | * @type: the type of the struct this is embedded in. |
| 369 | * @member: the name of the list_struct within the struct. | 369 | * @member: the name of the list_head within the struct. |
| 370 | * | 370 | * |
| 371 | * Note, that list is expected to be not empty. | 371 | * Note, that list is expected to be not empty. |
| 372 | */ | 372 | */ |
| @@ -377,7 +377,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 377 | * list_first_entry_or_null - get the first element from a list | 377 | * list_first_entry_or_null - get the first element from a list |
| 378 | * @ptr: the list head to take the element from. | 378 | * @ptr: the list head to take the element from. |
| 379 | * @type: the type of the struct this is embedded in. | 379 | * @type: the type of the struct this is embedded in. |
| 380 | * @member: the name of the list_struct within the struct. | 380 | * @member: the name of the list_head within the struct. |
| 381 | * | 381 | * |
| 382 | * Note that if the list is empty, it returns NULL. | 382 | * Note that if the list is empty, it returns NULL. |
| 383 | */ | 383 | */ |
| @@ -387,7 +387,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 387 | /** | 387 | /** |
| 388 | * list_next_entry - get the next element in list | 388 | * list_next_entry - get the next element in list |
| 389 | * @pos: the type * to cursor | 389 | * @pos: the type * to cursor |
| 390 | * @member: the name of the list_struct within the struct. | 390 | * @member: the name of the list_head within the struct. |
| 391 | */ | 391 | */ |
| 392 | #define list_next_entry(pos, member) \ | 392 | #define list_next_entry(pos, member) \ |
| 393 | list_entry((pos)->member.next, typeof(*(pos)), member) | 393 | list_entry((pos)->member.next, typeof(*(pos)), member) |
| @@ -395,7 +395,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 395 | /** | 395 | /** |
| 396 | * list_prev_entry - get the prev element in list | 396 | * list_prev_entry - get the prev element in list |
| 397 | * @pos: the type * to cursor | 397 | * @pos: the type * to cursor |
| 398 | * @member: the name of the list_struct within the struct. | 398 | * @member: the name of the list_head within the struct. |
| 399 | */ | 399 | */ |
| 400 | #define list_prev_entry(pos, member) \ | 400 | #define list_prev_entry(pos, member) \ |
| 401 | list_entry((pos)->member.prev, typeof(*(pos)), member) | 401 | list_entry((pos)->member.prev, typeof(*(pos)), member) |
| @@ -441,7 +441,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 441 | * list_for_each_entry - iterate over list of given type | 441 | * list_for_each_entry - iterate over list of given type |
| 442 | * @pos: the type * to use as a loop cursor. | 442 | * @pos: the type * to use as a loop cursor. |
| 443 | * @head: the head for your list. | 443 | * @head: the head for your list. |
| 444 | * @member: the name of the list_struct within the struct. | 444 | * @member: the name of the list_head within the struct. |
| 445 | */ | 445 | */ |
| 446 | #define list_for_each_entry(pos, head, member) \ | 446 | #define list_for_each_entry(pos, head, member) \ |
| 447 | for (pos = list_first_entry(head, typeof(*pos), member); \ | 447 | for (pos = list_first_entry(head, typeof(*pos), member); \ |
| @@ -452,7 +452,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 452 | * list_for_each_entry_reverse - iterate backwards over list of given type. | 452 | * list_for_each_entry_reverse - iterate backwards over list of given type. |
| 453 | * @pos: the type * to use as a loop cursor. | 453 | * @pos: the type * to use as a loop cursor. |
| 454 | * @head: the head for your list. | 454 | * @head: the head for your list. |
| 455 | * @member: the name of the list_struct within the struct. | 455 | * @member: the name of the list_head within the struct. |
| 456 | */ | 456 | */ |
| 457 | #define list_for_each_entry_reverse(pos, head, member) \ | 457 | #define list_for_each_entry_reverse(pos, head, member) \ |
| 458 | for (pos = list_last_entry(head, typeof(*pos), member); \ | 458 | for (pos = list_last_entry(head, typeof(*pos), member); \ |
| @@ -463,7 +463,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 463 | * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() | 463 | * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue() |
| 464 | * @pos: the type * to use as a start point | 464 | * @pos: the type * to use as a start point |
| 465 | * @head: the head of the list | 465 | * @head: the head of the list |
| 466 | * @member: the name of the list_struct within the struct. | 466 | * @member: the name of the list_head within the struct. |
| 467 | * | 467 | * |
| 468 | * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). | 468 | * Prepares a pos entry for use as a start point in list_for_each_entry_continue(). |
| 469 | */ | 469 | */ |
| @@ -474,7 +474,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 474 | * list_for_each_entry_continue - continue iteration over list of given type | 474 | * list_for_each_entry_continue - continue iteration over list of given type |
| 475 | * @pos: the type * to use as a loop cursor. | 475 | * @pos: the type * to use as a loop cursor. |
| 476 | * @head: the head for your list. | 476 | * @head: the head for your list. |
| 477 | * @member: the name of the list_struct within the struct. | 477 | * @member: the name of the list_head within the struct. |
| 478 | * | 478 | * |
| 479 | * Continue to iterate over list of given type, continuing after | 479 | * Continue to iterate over list of given type, continuing after |
| 480 | * the current position. | 480 | * the current position. |
| @@ -488,7 +488,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 488 | * list_for_each_entry_continue_reverse - iterate backwards from the given point | 488 | * list_for_each_entry_continue_reverse - iterate backwards from the given point |
| 489 | * @pos: the type * to use as a loop cursor. | 489 | * @pos: the type * to use as a loop cursor. |
| 490 | * @head: the head for your list. | 490 | * @head: the head for your list. |
| 491 | * @member: the name of the list_struct within the struct. | 491 | * @member: the name of the list_head within the struct. |
| 492 | * | 492 | * |
| 493 | * Start to iterate over list of given type backwards, continuing after | 493 | * Start to iterate over list of given type backwards, continuing after |
| 494 | * the current position. | 494 | * the current position. |
| @@ -502,7 +502,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 502 | * list_for_each_entry_from - iterate over list of given type from the current point | 502 | * list_for_each_entry_from - iterate over list of given type from the current point |
| 503 | * @pos: the type * to use as a loop cursor. | 503 | * @pos: the type * to use as a loop cursor. |
| 504 | * @head: the head for your list. | 504 | * @head: the head for your list. |
| 505 | * @member: the name of the list_struct within the struct. | 505 | * @member: the name of the list_head within the struct. |
| 506 | * | 506 | * |
| 507 | * Iterate over list of given type, continuing from current position. | 507 | * Iterate over list of given type, continuing from current position. |
| 508 | */ | 508 | */ |
| @@ -515,7 +515,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 515 | * @pos: the type * to use as a loop cursor. | 515 | * @pos: the type * to use as a loop cursor. |
| 516 | * @n: another type * to use as temporary storage | 516 | * @n: another type * to use as temporary storage |
| 517 | * @head: the head for your list. | 517 | * @head: the head for your list. |
| 518 | * @member: the name of the list_struct within the struct. | 518 | * @member: the name of the list_head within the struct. |
| 519 | */ | 519 | */ |
| 520 | #define list_for_each_entry_safe(pos, n, head, member) \ | 520 | #define list_for_each_entry_safe(pos, n, head, member) \ |
| 521 | for (pos = list_first_entry(head, typeof(*pos), member), \ | 521 | for (pos = list_first_entry(head, typeof(*pos), member), \ |
| @@ -528,7 +528,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 528 | * @pos: the type * to use as a loop cursor. | 528 | * @pos: the type * to use as a loop cursor. |
| 529 | * @n: another type * to use as temporary storage | 529 | * @n: another type * to use as temporary storage |
| 530 | * @head: the head for your list. | 530 | * @head: the head for your list. |
| 531 | * @member: the name of the list_struct within the struct. | 531 | * @member: the name of the list_head within the struct. |
| 532 | * | 532 | * |
| 533 | * Iterate over list of given type, continuing after current point, | 533 | * Iterate over list of given type, continuing after current point, |
| 534 | * safe against removal of list entry. | 534 | * safe against removal of list entry. |
| @@ -544,7 +544,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 544 | * @pos: the type * to use as a loop cursor. | 544 | * @pos: the type * to use as a loop cursor. |
| 545 | * @n: another type * to use as temporary storage | 545 | * @n: another type * to use as temporary storage |
| 546 | * @head: the head for your list. | 546 | * @head: the head for your list. |
| 547 | * @member: the name of the list_struct within the struct. | 547 | * @member: the name of the list_head within the struct. |
| 548 | * | 548 | * |
| 549 | * Iterate over list of given type from current point, safe against | 549 | * Iterate over list of given type from current point, safe against |
| 550 | * removal of list entry. | 550 | * removal of list entry. |
| @@ -559,7 +559,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 559 | * @pos: the type * to use as a loop cursor. | 559 | * @pos: the type * to use as a loop cursor. |
| 560 | * @n: another type * to use as temporary storage | 560 | * @n: another type * to use as temporary storage |
| 561 | * @head: the head for your list. | 561 | * @head: the head for your list. |
| 562 | * @member: the name of the list_struct within the struct. | 562 | * @member: the name of the list_head within the struct. |
| 563 | * | 563 | * |
| 564 | * Iterate backwards over list of given type, safe against removal | 564 | * Iterate backwards over list of given type, safe against removal |
| 565 | * of list entry. | 565 | * of list entry. |
| @@ -574,7 +574,7 @@ static inline void list_splice_tail_init(struct list_head *list, | |||
| 574 | * list_safe_reset_next - reset a stale list_for_each_entry_safe loop | 574 | * list_safe_reset_next - reset a stale list_for_each_entry_safe loop |
| 575 | * @pos: the loop cursor used in the list_for_each_entry_safe loop | 575 | * @pos: the loop cursor used in the list_for_each_entry_safe loop |
| 576 | * @n: temporary storage used in list_for_each_entry_safe | 576 | * @n: temporary storage used in list_for_each_entry_safe |
| 577 | * @member: the name of the list_struct within the struct. | 577 | * @member: the name of the list_head within the struct. |
| 578 | * | 578 | * |
| 579 | * list_safe_reset_next is not safe to use in general if the list may be | 579 | * list_safe_reset_next is not safe to use in general if the list may be |
| 580 | * modified concurrently (eg. the lock is dropped in the loop body). An | 580 | * modified concurrently (eg. the lock is dropped in the loop body). An |
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 44eeef0da186..745def862580 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -69,7 +69,7 @@ struct ieee1394_device_id { | |||
| 69 | * @bDeviceClass: Class of device; numbers are assigned | 69 | * @bDeviceClass: Class of device; numbers are assigned |
| 70 | * by the USB forum. Products may choose to implement classes, | 70 | * by the USB forum. Products may choose to implement classes, |
| 71 | * or be vendor-specific. Device classes specify behavior of all | 71 | * or be vendor-specific. Device classes specify behavior of all |
| 72 | * the interfaces on a devices. | 72 | * the interfaces on a device. |
| 73 | * @bDeviceSubClass: Subclass of device; associated with bDeviceClass. | 73 | * @bDeviceSubClass: Subclass of device; associated with bDeviceClass. |
| 74 | * @bDeviceProtocol: Protocol of device; associated with bDeviceClass. | 74 | * @bDeviceProtocol: Protocol of device; associated with bDeviceClass. |
| 75 | * @bInterfaceClass: Class of interface; numbers are assigned | 75 | * @bInterfaceClass: Class of interface; numbers are assigned |
diff --git a/include/linux/plist.h b/include/linux/plist.h index 8b6c970cff6c..97883604a3c5 100644 --- a/include/linux/plist.h +++ b/include/linux/plist.h | |||
| @@ -176,7 +176,7 @@ extern void plist_requeue(struct plist_node *node, struct plist_head *head); | |||
| 176 | * plist_for_each_entry - iterate over list of given type | 176 | * plist_for_each_entry - iterate over list of given type |
| 177 | * @pos: the type * to use as a loop counter | 177 | * @pos: the type * to use as a loop counter |
| 178 | * @head: the head for your list | 178 | * @head: the head for your list |
| 179 | * @mem: the name of the list_struct within the struct | 179 | * @mem: the name of the list_head within the struct |
| 180 | */ | 180 | */ |
| 181 | #define plist_for_each_entry(pos, head, mem) \ | 181 | #define plist_for_each_entry(pos, head, mem) \ |
| 182 | list_for_each_entry(pos, &(head)->node_list, mem.node_list) | 182 | list_for_each_entry(pos, &(head)->node_list, mem.node_list) |
| @@ -185,7 +185,7 @@ extern void plist_requeue(struct plist_node *node, struct plist_head *head); | |||
| 185 | * plist_for_each_entry_continue - continue iteration over list of given type | 185 | * plist_for_each_entry_continue - continue iteration over list of given type |
| 186 | * @pos: the type * to use as a loop cursor | 186 | * @pos: the type * to use as a loop cursor |
| 187 | * @head: the head for your list | 187 | * @head: the head for your list |
| 188 | * @m: the name of the list_struct within the struct | 188 | * @m: the name of the list_head within the struct |
| 189 | * | 189 | * |
| 190 | * Continue to iterate over list of given type, continuing after | 190 | * Continue to iterate over list of given type, continuing after |
| 191 | * the current position. | 191 | * the current position. |
| @@ -198,7 +198,7 @@ extern void plist_requeue(struct plist_node *node, struct plist_head *head); | |||
| 198 | * @pos: the type * to use as a loop counter | 198 | * @pos: the type * to use as a loop counter |
| 199 | * @n: another type * to use as temporary storage | 199 | * @n: another type * to use as temporary storage |
| 200 | * @head: the head for your list | 200 | * @head: the head for your list |
| 201 | * @m: the name of the list_struct within the struct | 201 | * @m: the name of the list_head within the struct |
| 202 | * | 202 | * |
| 203 | * Iterate over list of given type, safe against removal of list entry. | 203 | * Iterate over list of given type, safe against removal of list entry. |
| 204 | */ | 204 | */ |
| @@ -229,7 +229,7 @@ static inline int plist_node_empty(const struct plist_node *node) | |||
| 229 | * plist_first_entry - get the struct for the first entry | 229 | * plist_first_entry - get the struct for the first entry |
| 230 | * @head: the &struct plist_head pointer | 230 | * @head: the &struct plist_head pointer |
| 231 | * @type: the type of the struct this is embedded in | 231 | * @type: the type of the struct this is embedded in |
| 232 | * @member: the name of the list_struct within the struct | 232 | * @member: the name of the list_head within the struct |
| 233 | */ | 233 | */ |
| 234 | #ifdef CONFIG_DEBUG_PI_LIST | 234 | #ifdef CONFIG_DEBUG_PI_LIST |
| 235 | # define plist_first_entry(head, type, member) \ | 235 | # define plist_first_entry(head, type, member) \ |
| @@ -246,7 +246,7 @@ static inline int plist_node_empty(const struct plist_node *node) | |||
| 246 | * plist_last_entry - get the struct for the last entry | 246 | * plist_last_entry - get the struct for the last entry |
| 247 | * @head: the &struct plist_head pointer | 247 | * @head: the &struct plist_head pointer |
| 248 | * @type: the type of the struct this is embedded in | 248 | * @type: the type of the struct this is embedded in |
| 249 | * @member: the name of the list_struct within the struct | 249 | * @member: the name of the list_head within the struct |
| 250 | */ | 250 | */ |
| 251 | #ifdef CONFIG_DEBUG_PI_LIST | 251 | #ifdef CONFIG_DEBUG_PI_LIST |
| 252 | # define plist_last_entry(head, type, member) \ | 252 | # define plist_last_entry(head, type, member) \ |
diff --git a/include/linux/rculist.h b/include/linux/rculist.h index aa79b3c24f66..529bc946f450 100644 --- a/include/linux/rculist.h +++ b/include/linux/rculist.h | |||
| @@ -241,7 +241,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 241 | * list_entry_rcu - get the struct for this entry | 241 | * list_entry_rcu - get the struct for this entry |
| 242 | * @ptr: the &struct list_head pointer. | 242 | * @ptr: the &struct list_head pointer. |
| 243 | * @type: the type of the struct this is embedded in. | 243 | * @type: the type of the struct this is embedded in. |
| 244 | * @member: the name of the list_struct within the struct. | 244 | * @member: the name of the list_head within the struct. |
| 245 | * | 245 | * |
| 246 | * This primitive may safely run concurrently with the _rcu list-mutation | 246 | * This primitive may safely run concurrently with the _rcu list-mutation |
| 247 | * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock(). | 247 | * primitives such as list_add_rcu() as long as it's guarded by rcu_read_lock(). |
| @@ -278,7 +278,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 278 | * list_first_or_null_rcu - get the first element from a list | 278 | * list_first_or_null_rcu - get the first element from a list |
| 279 | * @ptr: the list head to take the element from. | 279 | * @ptr: the list head to take the element from. |
| 280 | * @type: the type of the struct this is embedded in. | 280 | * @type: the type of the struct this is embedded in. |
| 281 | * @member: the name of the list_struct within the struct. | 281 | * @member: the name of the list_head within the struct. |
| 282 | * | 282 | * |
| 283 | * Note that if the list is empty, it returns NULL. | 283 | * Note that if the list is empty, it returns NULL. |
| 284 | * | 284 | * |
| @@ -296,7 +296,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 296 | * list_for_each_entry_rcu - iterate over rcu list of given type | 296 | * list_for_each_entry_rcu - iterate over rcu list of given type |
| 297 | * @pos: the type * to use as a loop cursor. | 297 | * @pos: the type * to use as a loop cursor. |
| 298 | * @head: the head for your list. | 298 | * @head: the head for your list. |
| 299 | * @member: the name of the list_struct within the struct. | 299 | * @member: the name of the list_head within the struct. |
| 300 | * | 300 | * |
| 301 | * This list-traversal primitive may safely run concurrently with | 301 | * This list-traversal primitive may safely run concurrently with |
| 302 | * the _rcu list-mutation primitives such as list_add_rcu() | 302 | * the _rcu list-mutation primitives such as list_add_rcu() |
| @@ -311,7 +311,7 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
| 311 | * list_for_each_entry_continue_rcu - continue iteration over list of given type | 311 | * list_for_each_entry_continue_rcu - continue iteration over list of given type |
| 312 | * @pos: the type * to use as a loop cursor. | 312 | * @pos: the type * to use as a loop cursor. |
| 313 | * @head: the head for your list. | 313 | * @head: the head for your list. |
| 314 | * @member: the name of the list_struct within the struct. | 314 | * @member: the name of the list_head within the struct. |
| 315 | * | 315 | * |
| 316 | * Continue to iterate over list of given type, continuing after | 316 | * Continue to iterate over list of given type, continuing after |
| 317 | * the current position. | 317 | * the current position. |
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index c8a462ef9a4e..e939d2b3757a 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
| @@ -554,7 +554,7 @@ struct Scsi_Host { | |||
| 554 | * __devices is protected by the host_lock, but you should | 554 | * __devices is protected by the host_lock, but you should |
| 555 | * usually use scsi_device_lookup / shost_for_each_device | 555 | * usually use scsi_device_lookup / shost_for_each_device |
| 556 | * to access it and don't care about locking yourself. | 556 | * to access it and don't care about locking yourself. |
| 557 | * In the rare case of beeing in irq context you can use | 557 | * In the rare case of being in irq context you can use |
| 558 | * their __ prefixed variants with the lock held. NEVER | 558 | * their __ prefixed variants with the lock held. NEVER |
| 559 | * access this list directly from a driver. | 559 | * access this list directly from a driver. |
| 560 | */ | 560 | */ |
