Module Name: src
Committed By: dyoung
Date: Fri Oct 7 20:47:42 UTC 2011
Modified Files:
src/sys/dev/cardbus: if_ath_cardbus.c
src/sys/dev/pci: if_ath_pci.c
Log Message:
Stop calling ATH_LOCK_{INIT,DESTROY}(), they don't exist any more.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/if_ath_pci.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/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.44 src/sys/dev/cardbus/if_ath_cardbus.c:1.45
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.44 Mon Aug 1 11:20:27 2011
+++ src/sys/dev/cardbus/if_ath_cardbus.c Fri Oct 7 20:47:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.44 2011/08/01 11:20:27 drochner Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.45 2011/10/07 20:47:42 dyoung Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.44 2011/08/01 11:20:27 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.45 2011/10/07 20:47:42 dyoung Exp $");
#include "opt_inet.h"
@@ -186,8 +186,6 @@ ath_cardbus_attach(device_t parent, devi
*/
ath_cardbus_setup(csc);
- ATH_LOCK_INIT(sc);
-
/*
* Finish off the attach.
*/
@@ -235,8 +233,6 @@ ath_cardbus_detach(device_t self, int fl
Cardbus_mapreg_unmap(ct, ATH_PCI_MMBA, csc->sc_iot, csc->sc_ioh,
csc->sc_mapsize);
- ATH_LOCK_DESTROY(sc);
-
return (0);
}
Index: src/sys/dev/pci/if_ath_pci.c
diff -u src/sys/dev/pci/if_ath_pci.c:1.43 src/sys/dev/pci/if_ath_pci.c:1.44
--- src/sys/dev/pci/if_ath_pci.c:1.43 Mon Aug 29 14:47:08 2011
+++ src/sys/dev/pci/if_ath_pci.c Fri Oct 7 20:47:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.43 2011/08/29 14:47:08 jmcneill Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.44 2011/10/07 20:47:42 dyoung Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.43 2011/08/29 14:47:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.44 2011/10/07 20:47:42 dyoung Exp $");
/*
* PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
@@ -178,8 +178,6 @@ ath_pci_attach(device_t parent, device_t
aprint_verbose_dev(self, "interrupting at %s\n", intrstr);
- ATH_LOCK_INIT(sc);
-
if (ath_attach(PCI_PRODUCT(pa->pa_id), sc) != 0)
goto bad3;
@@ -190,8 +188,6 @@ ath_pci_attach(device_t parent, device_t
aprint_error_dev(self, "couldn't establish power handler\n");
return;
bad3:
- ATH_LOCK_DESTROY(sc);
-
pci_intr_disestablish(pc, psc->sc_ih);
bad1:
bus_space_unmap(psc->sc_iot, psc->sc_ioh, psc->sc_mapsz);
@@ -213,8 +209,6 @@ ath_pci_detach(device_t self, int flags)
if (psc->sc_ih != NULL)
pci_intr_disestablish(psc->sc_pc, psc->sc_ih);
- ATH_LOCK_DESTROY(&psc->sc_sc);
-
bus_space_unmap(psc->sc_iot, psc->sc_ioh, psc->sc_mapsz);
return 0;
}
