diff for duplicates of <20070206010331.GA22667@Krystal> diff --git a/a/1.txt b/N1/1.txt index 2fa832a..5e81bb3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,22 +14,20 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c -@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int i= -ndex, struct of_irq *out_irq +@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq return res; } EXPORT_SYMBOL_GPL(of_irq_map_one); + -+int of_irq_to_resource(struct device_node *dev, int index, struct resource= - *r) ++int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) +{ -+ int irq =3D irq_of_parse_and_map(dev, index); ++ int irq = irq_of_parse_and_map(dev, index); + + /* Only dereference the resource if both the + * resource and the irq are valid. */ -+ if (r && irq !=3D NO_IRQ) { -+ r->start =3D r->end =3D irq; -+ r->flags =3D IORESOURCE_IRQ; ++ if (r && irq != NO_IRQ) { ++ r->start = r->end = irq; ++ r->flags = IORESOURCE_IRQ; + } + + return irq; @@ -42,24 +40,22 @@ ndex, struct of_irq *out_irq #include <linux/platform_device.h> #include <asm/atomic.h> +#include <asm/irq.h> -=20 + /* Definitions used by the flattened device tree */ #define OF_DT_HEADER 0xd00dfeed /* marker */ -@@ -334,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, = -int index, +@@ -334,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, int index, struct pci_dev; extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); -=20 --static inline int of_irq_to_resource(struct device_node *dev, int index, s= -truct resource *r) + +-static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) -{ -- int irq =3D irq_of_parse_and_map(dev, index); +- int irq = irq_of_parse_and_map(dev, index); - - /* Only dereference the resource if both the - * resource and the irq are valid. */ -- if (r && irq !=3D NO_IRQ) { -- r->start =3D r->end =3D irq; -- r->flags =3D IORESOURCE_IRQ; +- if (r && irq != NO_IRQ) { +- r->start = r->end = irq; +- r->flags = IORESOURCE_IRQ; - } - - return irq; @@ -67,10 +63,10 @@ truct resource *r) - +extern int of_irq_to_resource(struct device_node *dev, int index, + struct resource *r); -=20 + #endif /* __KERNEL__ */ #endif /* _POWERPC_PROM_H */ ---=20 +-- Mathieu Desnoyers -Computer Engineering Graduate Student, =C9cole Polytechnique de Montr=E9al +Computer Engineering Graduate Student, École Polytechnique de Montréal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 diff --git a/a/content_digest b/N1/content_digest index 56ec5a3..a7e1829 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,8 +6,9 @@ "Subject\0[PATCH] Powerpc move of_irq_to_resource from prom.h to prom_parse.c\0" "Date\0Mon, 5 Feb 2007 20:03:31 -0500\0" "To\0Paul Mackerras <paulus@samba.org>\0" - "Cc\0Andrew Morton <akpm@osdl.org>" + "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" linux-kernel@vger.kernel.org + Andrew Morton <akpm@osdl.org> " linuxppc-dev@ozlabs.org\0" "\00:1\0" "b\0" @@ -27,22 +28,20 @@ "\n" "--- a/arch/powerpc/kernel/prom_parse.c\n" "+++ b/arch/powerpc/kernel/prom_parse.c\n" - "@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int i=\n" - "ndex, struct of_irq *out_irq\n" + "@@ -1003,3 +1003,18 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq\n" " \treturn res;\n" " }\n" " EXPORT_SYMBOL_GPL(of_irq_map_one);\n" "+\n" - "+int of_irq_to_resource(struct device_node *dev, int index, struct resource=\n" - " *r)\n" + "+int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)\n" "+{\n" - "+\tint irq =3D irq_of_parse_and_map(dev, index);\n" + "+\tint irq = irq_of_parse_and_map(dev, index);\n" "+\n" "+\t/* Only dereference the resource if both the\n" "+\t * resource and the irq are valid. */\n" - "+\tif (r && irq !=3D NO_IRQ) {\n" - "+\t\tr->start =3D r->end =3D irq;\n" - "+\t\tr->flags =3D IORESOURCE_IRQ;\n" + "+\tif (r && irq != NO_IRQ) {\n" + "+\t\tr->start = r->end = irq;\n" + "+\t\tr->flags = IORESOURCE_IRQ;\n" "+\t}\n" "+\n" "+\treturn irq;\n" @@ -55,24 +54,22 @@ " #include <linux/platform_device.h>\n" " #include <asm/atomic.h>\n" "+#include <asm/irq.h>\n" - "=20\n" + " \n" " /* Definitions used by the flattened device tree */\n" " #define OF_DT_HEADER\t\t0xd00dfeed\t/* marker */\n" - "@@ -334,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, =\n" - "int index,\n" + "@@ -334,20 +335,8 @@ extern int of_irq_map_one(struct device_node *device, int index,\n" " struct pci_dev;\n" " extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);\n" - "=20\n" - "-static inline int of_irq_to_resource(struct device_node *dev, int index, s=\n" - "truct resource *r)\n" + " \n" + "-static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)\n" "-{\n" - "-\tint irq =3D irq_of_parse_and_map(dev, index);\n" + "-\tint irq = irq_of_parse_and_map(dev, index);\n" "-\n" "-\t/* Only dereference the resource if both the\n" "-\t * resource and the irq are valid. */\n" - "-\tif (r && irq !=3D NO_IRQ) {\n" - "-\t\tr->start =3D r->end =3D irq;\n" - "-\t\tr->flags =3D IORESOURCE_IRQ;\n" + "-\tif (r && irq != NO_IRQ) {\n" + "-\t\tr->start = r->end = irq;\n" + "-\t\tr->flags = IORESOURCE_IRQ;\n" "-\t}\n" "-\n" "-\treturn irq;\n" @@ -80,12 +77,12 @@ "-\n" "+extern int of_irq_to_resource(struct device_node *dev, int index,\n" "+\t\t\tstruct resource *r);\n" - "=20\n" + " \n" " #endif /* __KERNEL__ */\n" " #endif /* _POWERPC_PROM_H */\n" - "--=20\n" + "-- \n" "Mathieu Desnoyers\n" - "Computer Engineering Graduate Student, =C9cole Polytechnique de Montr=E9al\n" + "Computer Engineering Graduate Student, \303\211cole Polytechnique de Montr\303\251al\n" OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -29a572ac02a7687b1e2456f091e7d0407c7f1d28d55085e9510161f9efc31de9 +c6a2cc468f7ef3d21f8a77cdee7ba58469006e972178aba26af6060e5786151a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.