From a5a0ba4318aafaa0686893ba62b2ab34598d88c7 Mon Sep 17 00:00:00 2001 From: Bryan O'Donoghue Date: Mon, 17 Aug 2015 00:55:10 +0100 Subject: [PATCH] greybus: loopback: remove checkpatch error causing macro checkpatch.pl is choking on a later change to dev_stats_attrs, where checkpatch expects to see the values encapsulated in curly brackets. Encapsulating in curly brackets will cause a compiler error. To resolve the dichotomy this patch drops the macros and adds the arrary declarations directly. Signed-off-by: Bryan O'Donoghue Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/loopback.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index ff2e79212877..0a9bc9139109 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -271,16 +271,19 @@ gb_dev_loopback_ro_attr(iteration_count); /* A bit-mask of destination connecitons to include in the test run */ gb_dev_loopback_rw_attr(mask, u); -#define dev_stats_attrs(name) \ - &dev_attr_##name##_min.attr, \ - &dev_attr_##name##_max.attr, \ - &dev_attr_##name##_avg.attr - static struct attribute *loopback_attrs[] = { - dev_stats_attrs(latency), - dev_stats_attrs(latency_gb), - dev_stats_attrs(requests_per_second), - dev_stats_attrs(throughput), + &dev_attr_latency_min.attr, + &dev_attr_latency_max.attr, + &dev_attr_latency_avg.attr, + &dev_attr_latency_gb_min.attr, + &dev_attr_latency_gb_max.attr, + &dev_attr_latency_gb_avg.attr, + &dev_attr_requests_per_second_min.attr, + &dev_attr_requests_per_second_max.attr, + &dev_attr_requests_per_second_avg.attr, + &dev_attr_throughput_min.attr, + &dev_attr_throughput_max.attr, + &dev_attr_throughput_avg.attr, &dev_attr_type.attr, &dev_attr_size.attr, &dev_attr_ms_wait.attr, -- 2.39.2