1 files changed, 2 insertions, 14 deletions

diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c
index 1b2c8bb81460..2d0679b60939 100644
--- a/arch/alpha/kernel/irq_alpha.c
+++ b/arch/alpha/kernel/irq_alpha.c
@@ -219,25 +219,12 @@ process_mcheck_info(unsigned long vector, unsigned long la_ptr,
  * processed by PALcode, and comes in via entInt vector 1.
  */
 
-static void rtc_enable_disable(unsigned int irq) { }
-static unsigned int rtc_startup(unsigned int irq) { return 0; }
-
 struct irqaction timer_irqaction = {
         .handler        = timer_interrupt,
         .flags          = IRQF_DISABLED,
         .name           = "timer",
 };
 
-static struct irq_chip rtc_irq_type = {
-        .name           = "RTC",
-        .startup        = rtc_startup,
-        .shutdown       = rtc_enable_disable,
-        .enable         = rtc_enable_disable,
-        .disable        = rtc_enable_disable,
-        .ack            = rtc_enable_disable,
-        .end            = rtc_enable_disable,
-};
-
 void __init
 init_rtc_irq(void)
 {
@@ -245,7 +232,8 @@ init_rtc_irq(void)
 
         if (desc) {
                 desc->status |= IRQ_DISABLED;
-                set_irq_chip(RTC_IRQ, &rtc_irq_type);
+                set_irq_chip_and_handler_name(RTC_IRQ, &no_irq_chip,
+                        handle_simple_irq, "RTC");
                 setup_irq(RTC_IRQ, &timer_irqaction);
         }
 }