From 7678b59a40fdb1ec45b5526bb178a364482521b5 Mon Sep 17 00:00:00 2001 From: Nick Hibma Date: Sat, 26 Jun 1999 12:55:25 +0000 Subject: [PATCH] Change 'device' to 'self', to be more like the rest of the code --- sys/dev/usb/ukbd.c | 4 ++-- sys/dev/usb/usb_port.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index c10777a37336..1fdc816ed507 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -168,7 +168,7 @@ USB_MATCH(ukbd) keyboard_switch_t *sw; void *arg[4]; - int unit = device_get_unit(device); + int unit = device_get_unit(self); sw = kbd_get_switch(DRIVER_NAME); if (sw == NULL) @@ -177,7 +177,7 @@ USB_MATCH(ukbd) arg[0] = (void *)uaa; arg[1] = (void *)ukbd_intr; arg[2] = (void *)ukbd_disconnect; - arg[3] = (void *)device; + arg[3] = (void *)self; if ((*sw->probe)(unit, (void *)arg, 0)) return (UMATCH_NONE); diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 87ed0d3db464..4c420a08d988 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -165,10 +165,10 @@ static driver_t __CONCAT(dname,_driver) = { \ #define USB_MATCH(dname) \ static int \ -__CONCAT(dname,_match)(device_t device) +__CONCAT(dname,_match)(device_t self) #define USB_MATCH_START(dname, uaa) \ - struct usb_attach_arg *uaa = device_get_ivars(device) + struct usb_attach_arg *uaa = device_get_ivars(self) #define USB_ATTACH(dname) \ static int \