hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/parisc/eisa.c
....@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * eisa.c - provide support for EISA adapters in PA-RISC machines
3
- *
4
- * This program is free software; you can redistribute it and/or
5
- * modify it under the terms of the GNU General Public License
6
- * as published by the Free Software Foundation; either version
7
- * 2 of the License, or (at your option) any later version.
84 *
95 * Copyright (c) 2001 Matthew Wilcox for Hewlett Packard
106 * Copyright (c) 2001 Daniel Engstrom <5116@telia.com>
....@@ -14,7 +10,6 @@
1410 * Wax ASIC also includes a PS/2 and RS-232 controller, but those are
1511 * dealt with elsewhere; this file is concerned only with the EISA portions
1612 * of Wax.
17
- *
1813 *
1914 * HINT:
2015 * -----
....@@ -44,6 +39,8 @@
4439 #include <asm/delay.h>
4540 #include <asm/eisa_bus.h>
4641 #include <asm/eisa_eeprom.h>
42
+
43
+#include "iommu.h"
4744
4845 #if 0
4946 #define EISA_DBG(msg, arg...) printk(KERN_DEBUG "eisa: " msg, ## arg)
....@@ -246,11 +243,6 @@
246243 return IRQ_HANDLED;
247244 }
248245
249
-static struct irqaction irq2_action = {
250
- .handler = dummy_irq2_handler,
251
- .name = "cascade",
252
-};
253
-
254246 static void init_eisa_pic(void)
255247 {
256248 unsigned long flags;
....@@ -338,7 +330,8 @@
338330 }
339331
340332 /* Reserve IRQ2 */
341
- setup_irq(2, &irq2_action);
333
+ if (request_irq(2, dummy_irq2_handler, 0, "cascade", NULL))
334
+ pr_err("Failed to request irq 2 (cascade)\n");
342335 for (i = 0; i < 16; i++) {
343336 irq_set_chip_and_handler(i, &eisa_interrupt_type,
344337 handle_simple_irq);
....@@ -357,10 +350,10 @@
357350 eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
358351 }
359352 }
360
- eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
353
+ eisa_eeprom_addr = ioremap(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
361354 if (!eisa_eeprom_addr) {
362355 result = -ENOMEM;
363
- printk(KERN_ERR "EISA: ioremap_nocache failed!\n");
356
+ printk(KERN_ERR "EISA: ioremap failed!\n");
364357 goto error_free_irq;
365358 }
366359 result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,