diff options
Diffstat (limited to 'drivers/parisc/hppb.c')
| -rw-r--r-- | drivers/parisc/hppb.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index 898208e4f302..0f9d80384e3d 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* ** hppb.c: ** HP-PB bus driver for the NOVA and K-Class systems. @@ -5,10 +6,6 @@ ** (c) Copyright 2002 Ryan Bradetich ** (c) Copyright 2002 Hewlett-Packard Company ** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. ** */ @@ -23,6 +20,8 @@ #include <asm/hardware.h> #include <asm/parisc-device.h> +#include "iommu.h" + struct hppb_card { unsigned long hpa; struct resource mmio_region; @@ -45,7 +44,7 @@ static struct hppb_card hppb_card_head = { * (return 1). If so, initialize the chip and tell other partners in crime * they have work to do. */ -static int hppb_probe(struct parisc_device *dev) +static int __init hppb_probe(struct parisc_device *dev) { int status; struct hppb_card *card = &hppb_card_head; @@ -62,8 +61,6 @@ static int hppb_probe(struct parisc_device *dev) } card = card->next; } - printk(KERN_INFO "Found GeckoBoa at 0x%llx\n", - (unsigned long long) dev->hpa.start); card->hpa = dev->hpa.start; card->mmio_region.name = "HP-PB Bus"; @@ -73,15 +70,16 @@ static int hppb_probe(struct parisc_device *dev) card->mmio_region.end = gsc_readl(dev->hpa.start + IO_IO_HIGH) - 1; status = ccio_request_resource(dev, &card->mmio_region); - if(status < 0) { - printk(KERN_ERR "%s: failed to claim HP-PB bus space (%pR)\n", - __FILE__, &card->mmio_region); - } + + pr_info("Found GeckoBoa at %pap, bus space %pR,%s claimed.\n", + &dev->hpa.start, + &card->mmio_region, + (status < 0) ? " not":"" ); return 0; } -static struct parisc_device_id hppb_tbl[] = { +static const struct parisc_device_id hppb_tbl[] __initconst = { { HPHW_BCPORT, HVERSION_REV_ANY_ID, 0x500, 0xc }, /* E25 and K */ { HPHW_BCPORT, 0x0, 0x501, 0xc }, /* E35 */ { HPHW_BCPORT, 0x0, 0x502, 0xc }, /* E45 */ @@ -89,7 +87,7 @@ static struct parisc_device_id hppb_tbl[] = { { 0, } }; -static struct parisc_driver hppb_driver = { +static struct parisc_driver hppb_driver __refdata = { .name = "gecko_boa", .id_table = hppb_tbl, .probe = hppb_probe, @@ -98,9 +96,10 @@ static struct parisc_driver hppb_driver = { /** * hppb_init - HP-PB bus initialization procedure. * - * Register this driver. + * Register this driver. */ -void __init hppb_init(void) +static int __init hppb_init(void) { - register_parisc_driver(&hppb_driver); + return register_parisc_driver(&hppb_driver); } +arch_initcall(hppb_init); |