diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-05-27 04:07:37 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-05-27 04:16:44 -0400 |
commit | a257954bb38ab23dbf93df812b4b2c01cae29d8b (patch) | |
tree | 6403ce5e81becd0592b1f658893bd5c0501acdb7 | |
parent | 8d2af85e87eda746ff50801f5decd8aed9aed28e (diff) |
genirq: Improve documentation to match current implementation
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiri Kosina <trivial@kernel.org>
Link: http://lkml.kernel.org/r/1401178092-1228-3-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | Documentation/IRQ-domain.txt | 3 | ||||
-rw-r--r-- | kernel/irq/internals.h | 2 | ||||
-rw-r--r-- | kernel/irq/irqdomain.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/IRQ-domain.txt b/Documentation/IRQ-domain.txt index 03df71aeb38c..8a8b82c9ca53 100644 --- a/Documentation/IRQ-domain.txt +++ b/Documentation/IRQ-domain.txt | |||
@@ -41,8 +41,7 @@ An interrupt controller driver creates and registers an irq_domain by | |||
41 | calling one of the irq_domain_add_*() functions (each mapping method | 41 | calling one of the irq_domain_add_*() functions (each mapping method |
42 | has a different allocator function, more on that later). The function | 42 | has a different allocator function, more on that later). The function |
43 | will return a pointer to the irq_domain on success. The caller must | 43 | will return a pointer to the irq_domain on success. The caller must |
44 | provide the allocator function with an irq_domain_ops structure with | 44 | provide the allocator function with an irq_domain_ops structure. |
45 | the .map callback populated as a minimum. | ||
46 | 45 | ||
47 | In most cases, the irq_domain will begin empty without any mappings | 46 | In most cases, the irq_domain will begin empty without any mappings |
48 | between hwirq and IRQ numbers. Mappings are added to the irq_domain | 47 | between hwirq and IRQ numbers. Mappings are added to the irq_domain |
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index c4065e3edbc3..099ea2e0eb88 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
@@ -33,7 +33,7 @@ enum { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Bit masks for desc->state | 36 | * Bit masks for desc->core_internal_state__do_not_mess_with_it |
37 | * | 37 | * |
38 | * IRQS_AUTODETECT - autodetection in progress | 38 | * IRQS_AUTODETECT - autodetection in progress |
39 | * IRQS_SPURIOUS_DISABLED - was disabled due to spurious interrupt | 39 | * IRQS_SPURIOUS_DISABLED - was disabled due to spurious interrupt |
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index f14033700c25..eb5e10e32e05 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c | |||
@@ -27,14 +27,14 @@ static struct irq_domain *irq_default_domain; | |||
27 | * __irq_domain_add() - Allocate a new irq_domain data structure | 27 | * __irq_domain_add() - Allocate a new irq_domain data structure |
28 | * @of_node: optional device-tree node of the interrupt controller | 28 | * @of_node: optional device-tree node of the interrupt controller |
29 | * @size: Size of linear map; 0 for radix mapping only | 29 | * @size: Size of linear map; 0 for radix mapping only |
30 | * @hwirq_max: Maximum number of interrupts supported by controller | ||
30 | * @direct_max: Maximum value of direct maps; Use ~0 for no limit; 0 for no | 31 | * @direct_max: Maximum value of direct maps; Use ~0 for no limit; 0 for no |
31 | * direct mapping | 32 | * direct mapping |
32 | * @ops: map/unmap domain callbacks | 33 | * @ops: map/unmap domain callbacks |
33 | * @host_data: Controller private data pointer | 34 | * @host_data: Controller private data pointer |
34 | * | 35 | * |
35 | * Allocates and initialize and irq_domain structure. Caller is expected to | 36 | * Allocates and initialize and irq_domain structure. |
36 | * register allocated irq_domain with irq_domain_register(). Returns pointer | 37 | * Returns pointer to IRQ domain, or NULL on failure. |
37 | * to IRQ domain, or NULL on failure. | ||
38 | */ | 38 | */ |
39 | struct irq_domain *__irq_domain_add(struct device_node *of_node, int size, | 39 | struct irq_domain *__irq_domain_add(struct device_node *of_node, int size, |
40 | irq_hw_number_t hwirq_max, int direct_max, | 40 | irq_hw_number_t hwirq_max, int direct_max, |