PERFORCE change 118268 for review

[Scott Long]

http://perforce.freebsd.org/chv.cgi?CH=118268

Change 118268 by scottl at scottl-wv1u on 2007/04/16 22:25:11

	Get rid of the done_lock definitions, they aren't used at all.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#16 edit
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#10 edit
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#14 edit
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#11 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#16 (text+ko) ====

@@ -122,7 +122,6 @@
 	sim = NULL;
 
 	ahd_lockinit(ahd);
-	ahd_done_lockinit(ahd);
 	ahd_list_lockinit();
 
 	/*
@@ -201,7 +200,9 @@
 	struct	ahd_softc *ahd;
 
 	ahd = (struct ahd_softc *)arg; 
+	ahd_lock(ahd, NULL);
 	ahd_intr(ahd);
+	ahd_unlock(ahd, NULL);
 }
 
 /*

==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#10 (text+ko) ====

@@ -193,11 +193,6 @@
 static __inline void ahd_lock(struct ahd_softc *, unsigned long *flags);
 static __inline void ahd_unlock(struct ahd_softc *, unsigned long *flags);
 
-/* Lock held during command compeletion to the upper layer */
-static __inline void ahd_done_lockinit(struct ahd_softc *);
-static __inline void ahd_done_lock(struct ahd_softc *, unsigned long *flags);
-static __inline void ahd_done_unlock(struct ahd_softc *, unsigned long *flags);
-
 /* Lock held during ahd_list manipulation and ahd softc frees */
 static __inline void ahd_list_lockinit(void);
 static __inline void ahd_list_lock(unsigned long *flags);
@@ -221,22 +216,6 @@
 	mtx_unlock(&ahd->platform_data->mtx);
 }
 
-/* Lock held during command compeletion to the upper layer */
-static __inline void
-ahd_done_lockinit(struct ahd_softc *ahd)
-{
-}
-
-static __inline void
-ahd_done_lock(struct ahd_softc *ahd, unsigned long *flags)
-{
-}
-
-static __inline void
-ahd_done_unlock(struct ahd_softc *ahd, unsigned long *flags)
-{
-}
-
 /* Lock held during ahd_list manipulation and ahd softc frees */
 static __inline void
 ahd_list_lockinit(void)

==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#14 (text+ko) ====

@@ -163,7 +163,6 @@
 
 
 	ahc_lockinit(ahc);
-	ahc_done_lockinit(ahc);
 	ahc_list_lockinit();
 
 	/*

==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.h#11 (text+ko) ====

@@ -191,11 +191,6 @@
 static __inline void ahc_lock(struct ahc_softc *, unsigned long *flags);
 static __inline void ahc_unlock(struct ahc_softc *, unsigned long *flags);
 
-/* Lock held during command compeletion to the upper layer */
-static __inline void ahc_done_lockinit(struct ahc_softc *);
-static __inline void ahc_done_lock(struct ahc_softc *, unsigned long *flags);
-static __inline void ahc_done_unlock(struct ahc_softc *, unsigned long *flags);
-
 /* Lock held during ahc_list manipulation and ahc softc frees */
 static __inline void ahc_list_lockinit(void);
 static __inline void ahc_list_lock(unsigned long *flags);
@@ -219,22 +214,6 @@
 	mtx_unlock(&ahc->platform_data->mtx);
 }
 
-/* Lock held during command compeletion to the upper layer */
-static __inline void
-ahc_done_lockinit(struct ahc_softc *ahc)
-{
-}
-
-static __inline void
-ahc_done_lock(struct ahc_softc *ahc, unsigned long *flags)
-{
-}
-
-static __inline void
-ahc_done_unlock(struct ahc_softc *ahc, unsigned long *flags)
-{
-}
-
 /* Lock held during ahc_list manipulation and ahc softc frees */
 static __inline void
 ahc_list_lockinit(void)