Module Name: src
Committed By: cegger
Date: Fri May 1 09:26:34 UTC 2009
Modified Files:
src/sys/arch/x86/pci: pciide_machdep.c
Log Message:
- struct device * -> device_t
- remove useless parenthesis
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/pci/pciide_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pciide_machdep.c
diff -u src/sys/arch/x86/pci/pciide_machdep.c:1.8 src/sys/arch/x86/pci/pciide_machdep.c:1.9
--- src/sys/arch/x86/pci/pciide_machdep.c:1.8 Wed Apr 16 16:06:51 2008
+++ src/sys/arch/x86/pci/pciide_machdep.c Fri May 1 09:26:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.8 2008/04/16 16:06:51 cegger Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.8 2008/04/16 16:06:51 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.9 2009/05/01 09:26:34 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@
#endif
void *
-pciide_machdep_compat_intr_establish(struct device *dev,
+pciide_machdep_compat_intr_establish(device_t dev,
struct pci_attach_args *pa, int chan, int (*func)(void *),
void *arg)
{
@@ -75,7 +75,7 @@
irq = PCIIDE_COMPAT_IRQ(chan);
cookie = isa_intr_establish(NULL, irq, IST_EDGE, IPL_BIO, func, arg);
if (cookie == NULL)
- return (NULL);
+ return NULL;
#if NIOAPIC > 0
if (mp_busses != NULL &&
(intr_find_mpmapping(mp_isa_bus, irq, &mpih) == 0 ||
@@ -88,5 +88,5 @@
#endif
aprint_normal_dev(dev, "%s channel interrupting at irq %d\n",
PCIIDE_CHANNEL_NAME(chan), irq);
- return (cookie);
+ return cookie;
}