summaryrefslogtreecommitdiff
path: root/sys/arch/arm/xscale
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2009-08-22 02:54:52 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2009-08-22 02:54:52 +0000
commit06e29584d413606b21c240635e12d7500b385ae5 (patch)
tree5e6f8a395a9c0030fc223059bb7a1b39529330c5 /sys/arch/arm/xscale
parentc647754eb2c6d41408fe754bf7167383562e01b1 (diff)
Constify the what/name parameter of pci_intr_establish().
Tested by myself, sthen, oga, kettenis, and jasper. Input from sthen and jasper. ok kettenis (Manpage follows shortly.)
Diffstat (limited to 'sys/arch/arm/xscale')
-rw-r--r--sys/arch/arm/xscale/i80321_intr.c4
-rw-r--r--sys/arch/arm/xscale/i80321var.h4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_gpio.c4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_gpio.h4
-rw-r--r--sys/arch/arm/xscale/pxa2x0_intr.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/arm/xscale/i80321_intr.c b/sys/arch/arm/xscale/i80321_intr.c
index 9ac0f057638..40da0d38489 100644
--- a/sys/arch/arm/xscale/i80321_intr.c
+++ b/sys/arch/arm/xscale/i80321_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i80321_intr.c,v 1.12 2009/04/08 21:19:31 kettenis Exp $ */
+/* $OpenBSD: i80321_intr.c,v 1.13 2009/08/22 02:54:50 mk Exp $ */
/*
* Copyright (c) 2006 Dale Rahn <drahn@openbsd.org>
@@ -301,7 +301,7 @@ i80321intc_init(void)
void *
i80321_intr_establish(int irq, int ipl, int (*func)(void *), void *arg,
- char *name)
+ const char *name)
{
struct intrq *iq;
struct intrhand *ih;
diff --git a/sys/arch/arm/xscale/i80321var.h b/sys/arch/arm/xscale/i80321var.h
index cdf72ac83d9..9613a40cf0f 100644
--- a/sys/arch/arm/xscale/i80321var.h
+++ b/sys/arch/arm/xscale/i80321var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i80321var.h,v 1.3 2006/06/15 21:35:30 drahn Exp $ */
+/* $OpenBSD: i80321var.h,v 1.4 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: i80321var.h,v 1.10 2005/12/15 01:44:00 briggs Exp $ */
/*
@@ -57,7 +57,7 @@ struct intrhand {
int ih_ipl; /* IPL_* */
int ih_irq; /* IRQ number */
struct evcount ih_count;
- char *ih_name;
+ const char *ih_name;
};
struct intrq {
diff --git a/sys/arch/arm/xscale/pxa2x0_gpio.c b/sys/arch/arm/xscale/pxa2x0_gpio.c
index 748e0535585..e6dc20a4400 100644
--- a/sys/arch/arm/xscale/pxa2x0_gpio.c
+++ b/sys/arch/arm/xscale/pxa2x0_gpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_gpio.c,v 1.20 2008/05/19 18:42:12 miod Exp $ */
+/* $OpenBSD: pxa2x0_gpio.c,v 1.21 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pxa2x0_gpio.c,v 1.2 2003/07/15 00:24:55 lukem Exp $ */
/*
@@ -211,7 +211,7 @@ pxa2x0_gpio_bootstrap(vaddr_t gpio_regs)
void *
pxa2x0_gpio_intr_establish(u_int gpio, int level, int spl, int (*func)(void *),
- void *arg, char *name)
+ void *arg, const char *name)
{
struct pxagpio_softc *sc = pxagpio_softc;
struct gpio_irq_handler *gh;
diff --git a/sys/arch/arm/xscale/pxa2x0_gpio.h b/sys/arch/arm/xscale/pxa2x0_gpio.h
index c4f414a2dd9..bab08809bb4 100644
--- a/sys/arch/arm/xscale/pxa2x0_gpio.h
+++ b/sys/arch/arm/xscale/pxa2x0_gpio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_gpio.h,v 1.5 2005/04/08 21:50:37 uwe Exp $ */
+/* $OpenBSD: pxa2x0_gpio.h,v 1.6 2009/08/22 02:54:50 mk Exp $ */
/* $wasabi$ */
/*
@@ -62,7 +62,7 @@ void pxa2x0_gpio_clear_intr(u_int gpio);
* Establish/Disestablish interrupt handlers for GPIO pins
*/
void *pxa2x0_gpio_intr_establish(u_int, int, int, int (*)(void *), void *,
- char *);
+ const char *);
void pxa2x0_gpio_intr_disestablish(void *);
const char *pxa2x0_gpio_intr_string(void *);
void pxa2x0_gpio_intr_mask(void *);
diff --git a/sys/arch/arm/xscale/pxa2x0_intr.c b/sys/arch/arm/xscale/pxa2x0_intr.c
index 8a9bb619dab..fc782e10492 100644
--- a/sys/arch/arm/xscale/pxa2x0_intr.c
+++ b/sys/arch/arm/xscale/pxa2x0_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0_intr.c,v 1.18 2009/04/08 21:19:31 kettenis Exp $ */
+/* $OpenBSD: pxa2x0_intr.c,v 1.19 2009/08/22 02:54:50 mk Exp $ */
/* $NetBSD: pxa2x0_intr.c,v 1.5 2003/07/15 00:24:55 lukem Exp $ */
/*
@@ -531,7 +531,7 @@ _setsoftintr(int si)
void *
pxa2x0_intr_establish(int irqno, int level,
- int (*func)(void *), void *arg, char *name)
+ int (*func)(void *), void *arg, const char *name)
{
int psw;
#ifdef MULTIPLE_HANDLERS_ON_ONE_IRQ