[POWERPC] Cleanup pegasos i8259 not in device tree workaround.

[POWERPC] Cleanup pegasos i8259 not in device tree workaround.

[Grant Likely]

From: Grant Likely <grant.likely@secretlab.ca>

Only make assumptions about i8259 presence if ppc_md.get_irq is not set.
Previous workaround only checked chrp_mpic value.

Nicolas, please verify that this patch fixes your mpc52xx pic problems.
Ben, I got tired of how often this question was being raised, so I just
wrote this patch; I've compiled, but cannot test it.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
 arch/powerpc/platforms/chrp/setup.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 49b8dab..a5466ed 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -451,7 +451,7 @@ static void __init chrp_find_8259(void)
 	 * we have a pegasos that claims to be chrp but doesn't have
 	 * a proper interrupt tree
 	 */
-	if (pic == NULL && chrp_mpic != NULL) {
+	if (pic == NULL && ppc_md.get_irq != NULL) {
 		printk(KERN_ERR "i8259: Not found in device-tree"
 		       " assuming no legacy interrupts\n");
 		return;
-- 
1.4.3.rc2.g0503

Re: [POWERPC] Cleanup pegasos i8259 not in device tree workaround.

[Benjamin Herrenschmidt]

On Fri, 2006-10-27 at 10:42 -0600, Grant Likely wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
> 
> Only make assumptions about i8259 presence if ppc_md.get_irq is not set.
> Previous workaround only checked chrp_mpic value.
> 
> Nicolas, please verify that this patch fixes your mpc52xx pic problems.
> Ben, I got tired of how often this question was being raised, so I just
> wrote this patch; I've compiled, but cannot test it.
> 
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> ---
>  arch/powerpc/platforms/chrp/setup.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
> index 49b8dab..a5466ed 100644
> --- a/arch/powerpc/platforms/chrp/setup.c
> +++ b/arch/powerpc/platforms/chrp/setup.c
> @@ -451,7 +451,7 @@ static void __init chrp_find_8259(void)
>  	 * we have a pegasos that claims to be chrp but doesn't have
>  	 * a proper interrupt tree
>  	 */
> -	if (pic == NULL && chrp_mpic != NULL) {
> +	if (pic == NULL && ppc_md.get_irq != NULL) {
>  		printk(KERN_ERR "i8259: Not found in device-tree"
>  		       " assuming no legacy interrupts\n");
>  		return;