--- src/sys/dev/disk/nata/ata-all.h	2006/12/04 14:40:37	1.1
+++ src/sys/dev/disk/nata/ata-all.h	2006/12/04 15:15:54	1.2
@@ -551,30 +551,15 @@ int ata_generic_command(struct ata_reque
 
 /* macros for alloc/free of struct ata_request */
 extern struct objcache *ata_request_cache;
-static __inline struct ata_request *
-ata_alloc_request(void)
-{
-	struct ata_request *arp;
-	arp = objcache_get(ata_request_cache, M_WAITOK);
-	/* we need it completely zeroed */
-	bzero(arp, sizeof(struct ata_request));
-	return arp;
-}
+#define ata_alloc_request() objcache_get(ata_request_cache, M_WAITOK | M_ZERO)
 #define ata_free_request(request) { \
 	if (!(request->flags & ATA_R_DANGER2)) \
 	    objcache_put(ata_request_cache, request); \
 	}
 /* macros for alloc/free of struct ata_composite */
 extern struct objcache *ata_composite_cache;
-static __inline struct ata_composite *
-ata_alloc_composite(void)
-{
-	struct ata_composite *acp;
-	acp = objcache_get(ata_composite_cache, M_WAITOK);
-	/* we need it completely zeroed */
-	bzero(acp, sizeof(struct ata_composite));
-	return acp;
-}
+#define ata_alloc_composite() objcache_get(ata_composite_cache, \
+					   M_WAITOK | M_ZERO);
 #define ata_free_composite(composite) objcache_put(ata_composite_cache, \
 						   composite)