From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933528AbdKBOdO (ORCPT ); Thu, 2 Nov 2017 10:33:14 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:57882 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932999AbdKBOdM (ORCPT ); Thu, 2 Nov 2017 10:33:12 -0400 From: Arnd Bergmann To: "Bryan O'Donoghue" , Johan Hovold , Alex Elder , Greg Kroah-Hartman Cc: Arnd Bergmann , Viresh Kumar , Gioh Kim , Arushi Singhal , Abdul Rauf , greybus-dev@lists.linaro.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: greybus: remove unused kfifo_ts Date: Thu, 2 Nov 2017 15:32:51 +0100 Message-Id: <20171102143304.851481-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:j9Q/PG1SJriJVJyqs+HeYvvu2a5bqDm4W6Z8O4hoZz3xT+fVgSQ 3rQ0k0qhAeGB1g/4zhgus8D1rtdHdLF510FURoMayl2E9RVjAbodQ3XJgIBaxCI2ORXyHb9 RvGVe3sKSXbFPCq3O+hUeEfeCVr+bgUeoj3EbIeDlgSN7aBtU8smD4a0YyHoE2GBstDDYT4 9oQfnm5F2tQ9BEY7JIA3Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:l4b57FXkaFA=:Jah4Tbb0zY3vTyfWayR/vE rJVVHH+6SgxwlF9/H90JCFbSNJUfDmhla8NBwpXRC0ff8udbnEVxSmHPc2fExt+TgQin+hNwj yhZ0PdWNtlYdK61zisE/ub527Sh5g9ATCBqwykArYyZtbm3WCZcwLT2SWbaicG+DYUUR5nox7 c4HPV4nU2XNHkAITQghRzRI7yw5MZE6hlBEztB/jUxuiaGRYwRymaZ2BwZ8m0jMALKkPslYgN v33IOEaVg2YJ9LwY8GhWXCYvrWIqEA2HaBvi6p1usVJrVKJFqjmLVd1FU6mM3fAOv17TyVB89 TOIZRSDbRCc7iNQUdUDxSP8s0DUP42ASheFRK7RmC3P50t+/ChJHG5uCXAhylKenJj3dDNKSJ eCZBceGxTLkO1t64jUPMBuMcNk0iOWcMKtxvVo1GOs++xY5EEYfmzDhZbkq4kwmqE2llpeN1M C9+VLM0KblSoiAZnZ/n9OHbRrbCyd0yr05GRlqg6vBa7Zqd8+KqT7giEyM3OxMpMcw+sXNBxl JxTfA8CexTuDX2WORo3rsaAWAHsd3F9k3NYHkfqsxVMtFmQ5GgB8tIWNO+lGTp7rKJtUCROE+ n89ZOHEaA6Sfnmn4GZAKP3fwi6d1NaVJfdUzgDXHJy3QWkReUkvHcCtemIUH4daEf/FCgoLCj Z0Y9zi02vQl3Ggrbxc+IXLulqi5hbYsars2K/mPOWfeBA7PvJnz97fQclaUG3KFmjuN/QFcrx kynlIWJc9DxFHVSB0wMdM8aL9jF6s/yMpnioJA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As of commit 8e1d6c336d74 ("greybus: loopback: drop bus aggregate calculation"), nothing ever reads from kfifo_ts, so there is no reason to write to it or even allocate it any more. Signed-off-by: Arnd Bergmann --- drivers/staging/greybus/loopback.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 08e255884206..85046fb16aad 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -72,7 +72,6 @@ struct gb_loopback { struct dentry *file; struct kfifo kfifo_lat; - struct kfifo kfifo_ts; struct mutex mutex; struct task_struct *task; struct list_head entry; @@ -262,7 +261,6 @@ static void gb_loopback_check_attr(struct gb_loopback *gb) gb->iteration_max, kfifo_depth); } kfifo_reset_out(&gb->kfifo_lat); - kfifo_reset_out(&gb->kfifo_ts); switch (gb->type) { case GB_LOOPBACK_TYPE_PING: @@ -387,13 +385,6 @@ static u64 gb_loopback_calc_latency(struct timeval *ts, struct timeval *te) return __gb_loopback_calc_latency(t1, t2); } -static void gb_loopback_push_latency_ts(struct gb_loopback *gb, - struct timeval *ts, struct timeval *te) -{ - kfifo_in(&gb->kfifo_ts, (unsigned char *)ts, sizeof(*ts)); - kfifo_in(&gb->kfifo_ts, (unsigned char *)te, sizeof(*te)); -} - static int gb_loopback_operation_sync(struct gb_loopback *gb, int type, void *request, int request_size, void *response, int response_size) @@ -433,7 +424,6 @@ static int gb_loopback_operation_sync(struct gb_loopback *gb, int type, do_gettimeofday(&te); /* Calculate the total time the message took */ - gb_loopback_push_latency_ts(gb, &ts, &te); gb->elapsed_nsecs = gb_loopback_calc_latency(&ts, &te); out_put_operation: @@ -521,11 +511,9 @@ static void gb_loopback_async_operation_callback(struct gb_operation *operation) err = true; } - if (!err) { - gb_loopback_push_latency_ts(gb, &op_async->ts, &te); + if (!err) gb->elapsed_nsecs = gb_loopback_calc_latency(&op_async->ts, &te); - } if (op_async->pending) { if (err) @@ -1241,18 +1229,12 @@ static int gb_loopback_probe(struct gb_bundle *bundle, retval = -ENOMEM; goto out_conn; } - if (kfifo_alloc(&gb->kfifo_ts, kfifo_depth * sizeof(struct timeval) * 2, - GFP_KERNEL)) { - retval = -ENOMEM; - goto out_kfifo0; - } - /* Fork worker thread */ mutex_init(&gb->mutex); gb->task = kthread_run(gb_loopback_fn, gb, "gb_loopback"); if (IS_ERR(gb->task)) { retval = PTR_ERR(gb->task); - goto out_kfifo1; + goto out_kfifo; } spin_lock_irqsave(&gb_dev.lock, flags); @@ -1266,9 +1248,7 @@ static int gb_loopback_probe(struct gb_bundle *bundle, return 0; -out_kfifo1: - kfifo_free(&gb->kfifo_ts); -out_kfifo0: +out_kfifo: kfifo_free(&gb->kfifo_lat); out_conn: device_unregister(dev); @@ -1302,7 +1282,6 @@ static void gb_loopback_disconnect(struct gb_bundle *bundle) kthread_stop(gb->task); kfifo_free(&gb->kfifo_lat); - kfifo_free(&gb->kfifo_ts); gb_connection_latency_tag_disable(gb->connection); debugfs_remove(gb->file); -- 2.9.0