| From 1fec5e9aa9ad2a9a6abbc8c47a2005c96a75edc6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 14 Apr 2021 20:12:49 +0300 |
| Subject: intel_th: Consistency and off-by-one fix |
| |
| From: Pavel Machek <pavel@ucw.cz> |
| |
| [ Upstream commit 18ffbc47d45a1489b664dd68fb3a7610a6e1dea3 ] |
| |
| Consistently use "< ... +1" in for loops. |
| |
| Fix of-by-one in for_each_set_bit(). |
| |
| Signed-off-by: Pavel Machek <pavel@denx.de> |
| Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Link: https://lore.kernel.org/lkml/20190724095841.GA6952@amd/ |
| Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Link: https://lore.kernel.org/r/20210414171251.14672-6-alexander.shishkin@linux.intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hwtracing/intel_th/gth.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/hwtracing/intel_th/gth.c b/drivers/hwtracing/intel_th/gth.c |
| index 2a3ae9006c58..79473ba48d0c 100644 |
| --- a/drivers/hwtracing/intel_th/gth.c |
| +++ b/drivers/hwtracing/intel_th/gth.c |
| @@ -485,7 +485,7 @@ static void intel_th_gth_disable(struct intel_th_device *thdev, |
| output->active = false; |
| |
| for_each_set_bit(master, gth->output[output->port].master, |
| - TH_CONFIGURABLE_MASTERS) { |
| + TH_CONFIGURABLE_MASTERS + 1) { |
| gth_master_set(gth, master, -1); |
| } |
| spin_unlock(>h->gth_lock); |
| @@ -624,7 +624,7 @@ static void intel_th_gth_unassign(struct intel_th_device *thdev, |
| othdev->output.port = -1; |
| othdev->output.active = false; |
| gth->output[port].output = NULL; |
| - for (master = 0; master <= TH_CONFIGURABLE_MASTERS; master++) |
| + for (master = 0; master < TH_CONFIGURABLE_MASTERS + 1; master++) |
| if (gth->master[master] == port) |
| gth->master[master] = -1; |
| spin_unlock(>h->gth_lock); |
| -- |
| 2.30.2 |
| |