[src/trunk]: src/sys/dev Stop calling ATH_LOCK_{INIT, DESTROY}(), they don't e...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71546579377b
branches:  trunk
changeset: 770198:71546579377b
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Oct 07 20:47:42 2011 +0000

description:
Stop calling ATH_LOCK_{INIT,DESTROY}(), they don't exist any more.

diffstat:

 sys/dev/cardbus/if_ath_cardbus.c |   8 ++------
 sys/dev/pci/if_ath_pci.c         |  10 ++--------
 2 files changed, 4 insertions(+), 14 deletions(-)

diffs (81 lines):

diff -r 83a42ae5e250 -r 71546579377b sys/dev/cardbus/if_ath_cardbus.c
--- a/sys/dev/cardbus/if_ath_cardbus.c  Fri Oct 07 20:22:59 2011 +0000
+++ b/sys/dev/cardbus/if_ath_cardbus.c  Fri Oct 07 20:47:42 2011 +0000
@@ -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 <ichiro%ichiro.org@localhost>.
@@ -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_setup(csc);
 
-       ATH_LOCK_INIT(sc);
-
        /*
         * Finish off the attach.
         */
@@ -235,8 +233,6 @@
        Cardbus_mapreg_unmap(ct, ATH_PCI_MMBA, csc->sc_iot, csc->sc_ioh,
            csc->sc_mapsize);
 
-       ATH_LOCK_DESTROY(sc);
-
        return (0);
 }
 
diff -r 83a42ae5e250 -r 71546579377b sys/dev/pci/if_ath_pci.c
--- a/sys/dev/pci/if_ath_pci.c  Fri Oct 07 20:22:59 2011 +0000
+++ b/sys/dev/pci/if_ath_pci.c  Fri Oct 07 20:47:42 2011 +0000
@@ -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 @@
 
        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 @@
                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 @@
        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;
 }