parse: get rid of __td_var()

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/parse.h b/parse.h
index aa00a679ef4fd918f0260b25d0e32b38ae83ad7b..62fd9706816873f4a2909384cd973568ffbc28a0 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -109,16 +109,18 @@ typedef int (fio_opt_str_val_fn)(void *, long long *);
 typedef int (fio_opt_int_fn)(void *, int *);
 typedef int (fio_opt_str_set_fn)(void *);
 
-#define __td_var(start, offset)        ((char *) start + (offset))
-
 struct thread_options;
 static inline void *td_var(struct thread_options *to, struct fio_option *o,
                           unsigned int offset)
 {
+       void *ret;
+
        if (o->prof_opts)
-               return __td_var(o->prof_opts, offset);
+               ret = o->prof_opts;
+       else
+               ret = to;
 
-       return __td_var(to, offset);
+       return ret + offset;
 }
 
 static inline int parse_is_percent(unsigned long long val)