From 66f807ed8b3634dc73d9f7526c484e43f094c0ee Mon Sep 17 00:00:00 2001 From: des Date: Thu, 23 Oct 2008 15:53:51 +0000 Subject: Retire the MALLOC and FREE macros. They are an abomination unto style(9). MFC after: 3 months --- sys/dev/ray/if_ray.c | 3 +-- sys/dev/ray/if_rayvar.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/dev/ray') diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c index 0742c7c..513312c 100644 --- a/sys/dev/ray/if_ray.c +++ b/sys/dev/ray/if_ray.c @@ -3177,8 +3177,7 @@ ray_com_malloc(ray_comqfn_t function, int flags, char *mesg) { struct ray_comq_entry *com; - MALLOC(com, struct ray_comq_entry *, - sizeof(struct ray_comq_entry), M_RAYCOM, M_WAITOK); + com = malloc( sizeof(struct ray_comq_entry), M_RAYCOM, M_WAITOK); return (ray_com_init(com, function, flags, mesg)); } diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h index 7376405..d3498a4 100644 --- a/sys/dev/ray/if_rayvar.h +++ b/sys/dev/ray/if_rayvar.h @@ -249,7 +249,7 @@ static int mib_info[RAY_MIB_MAX+1][3] = RAY_MIB_INFO; #define RAY_COM_FREE(com, ncom) do { \ int i; \ for (i = 0; i < ncom; i++) \ - FREE(com[i], M_RAYCOM); \ + free(com[i], M_RAYCOM); \ } while (0) /* -- cgit v1.1