summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2001-03-22 05:49:18 +0000
committerimp <imp@FreeBSD.org>2001-03-22 05:49:18 +0000
commitbf947a58aad2f2c5b70fc4d775aa2b24501702df (patch)
tree91fbb0480be3a6bd5b2953af7365140032c784a4
parent6e66a78b31232b05de35c238d18f7a700e113277 (diff)
downloadFreeBSD-src-bf947a58aad2f2c5b70fc4d775aa2b24501702df.zip
FreeBSD-src-bf947a58aad2f2c5b70fc4d775aa2b24501702df.tar.gz
Axe a few __P() while I'm in the neighborhood.
-rw-r--r--sys/pccard/driver.h12
-rw-r--r--sys/pccard/pcic.c7
-rw-r--r--sys/pccard/slot.h14
3 files changed, 16 insertions, 17 deletions
diff --git a/sys/pccard/driver.h b/sys/pccard/driver.h
index 3b237f3..f5705ab 100644
--- a/sys/pccard/driver.h
+++ b/sys/pccard/driver.h
@@ -11,14 +11,14 @@
struct pccard_device;
-void pccard_add_driver __P((struct pccard_device *));
+void pccard_add_driver(struct pccard_device *);
enum beepstate { BEEP_OFF, BEEP_ON };
-void pccard_insert_beep __P((void));
-void pccard_remove_beep __P((void));
-void pccard_success_beep __P((void));
-void pccard_failure_beep __P((void));
-int pccard_beep_select __P((int));
+void pccard_insert_beep(void);
+void pccard_remove_beep(void);
+void pccard_success_beep(void);
+void pccard_failure_beep(void);
+int pccard_beep_select(int);
#endif /* !_PCCARD_DRIVER_H_ */
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 3443ef6..1b06031 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -1,6 +1,5 @@
/*
* Intel PCIC or compatible Controller driver
- * May be built to make a loadable module.
*-------------------------------------------------------------------------
*
* Copyright (c) 1995 Andrew McRae. All rights reserved.
@@ -50,11 +49,11 @@
* Prototypes for interrupt handler.
*/
static driver_intr_t pcicintr;
-static int pcic_ioctl __P((struct slot *, int, caddr_t));
-static int pcic_power __P((struct slot *));
+static int pcic_ioctl(struct slot *, int, caddr_t);
+static int pcic_power(struct slot *);
static timeout_t pcic_reset;
static void pcic_resume(struct slot *);
-static void pcic_disable __P((struct slot *));
+static void pcic_disable(struct slot *);
static timeout_t pcictimeout;
static struct callout_handle pcictimeout_ch
= CALLOUT_HANDLE_INITIALIZER(&pcictimeout_ch);
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index f43122c..67f756d 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -54,19 +54,19 @@
*/
struct slot;
struct slot_ctrl {
- int (*mapmem) __P((struct slot *, int));
+ int (*mapmem)(struct slot *, int);
/* Map memory */
- int (*mapio) __P((struct slot *, int));
+ int (*mapio)(struct slot *, int);
/* Map io */
- void (*reset) __P((void *));
+ void (*reset)(void *);
/* init */
- void (*disable) __P((struct slot *));
+ void (*disable)(struct slot *);
/* Disable slot */
- int (*power) __P((struct slot *));
+ int (*power)(struct slot *);
/* Set power values */
- int (*ioctl) __P((struct slot *, int, caddr_t));
+ int (*ioctl)(struct slot *, int, caddr_t);
/* ioctl to lower level */
- void (*resume) __P((struct slot *));
+ void (*resume)(struct slot *);
/* suspend/resume support */
int maxmem; /* Number of allowed memory windows */
int maxio; /* Number of allowed I/O windows */
OpenPOWER on IntegriCloud