From: Eero Tamminen <oak@helsinkinet.fi>
To: linux-m68k <linux-m68k@lists.linux-m68k.org>
Cc: Michael Schmitz <schmitzmic@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Eero Tamminen <oak@helsinkinet.fi>
Subject: [PATCH 1/2] m68k: Drop Atari EtherNAT support when it's not configured in
Date: Mon, 23 Sep 2024 00:48:20 +0300 [thread overview]
Message-ID: <20240922214821.16818-1-oak@helsinkinet.fi> (raw)
Not having it configured, but crash backtraces going through its IRQ
handling code, is confusing (found while debugging issues in Atari
emulation).
Signed-off-by: Eero Tamminen <oak@helsinkinet.fi>
---
arch/m68k/atari/ataints.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 0465444ce..fa189eeb7 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -179,6 +179,7 @@ static struct irq_chip atari_mfptimer_chip = {
};
+#ifdef CONFIG_ATARI_ETHERNAT
/*
* EtherNAT CPLD interrupt handling
* CPLD interrupt register is at phys. 0x80000023
@@ -251,6 +252,7 @@ static struct irq_chip atari_ethernat_chip = {
.irq_enable = atari_ethernat_enable,
.irq_disable = atari_ethernat_disable,
};
+#endif
/*
* void atari_init_IRQ (void)
@@ -343,12 +345,13 @@ void __init atari_init_IRQ(void)
stmfp_base.name, &stmfp_base))
pr_err("Couldn't register %s interrupt\n", stmfp_base.name);
+#ifdef CONFIG_ATARI_ETHERNAT
/*
* EtherNAT ethernet / USB interrupt handlers
*/
-
m68k_setup_irq_controller(&atari_ethernat_chip, handle_simple_irq,
139, 2);
+#endif
}
--
2.39.5
next reply other threads:[~2024-09-22 21:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-22 21:48 Eero Tamminen [this message]
2024-09-22 21:48 ` [PATCH 2/2] m68k: Set reasonable PSG port-A default value Eero Tamminen
2024-09-22 21:58 ` [PATCH 1/2] m68k: Drop Atari EtherNAT support when it's not configured in John Paul Adrian Glaubitz
2024-09-23 8:39 ` Eero Tamminen
2024-09-23 9:04 ` John Paul Adrian Glaubitz
2024-09-24 1:03 ` Michael Schmitz
2024-09-24 20:58 ` Eero Tamminen
2024-09-24 21:09 ` Andreas Schwab
2024-09-24 23:11 ` Eero Tamminen
2024-09-25 17:13 ` Andreas Schwab
2024-09-26 15:41 ` Eero Tamminen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240922214821.16818-1-oak@helsinkinet.fi \
--to=oak@helsinkinet.fi \
--cc=geert@linux-m68k.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=schmitzmic@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox