From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org
Cc: linux-rpi-kernel@lists.infradead.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
bcm-kernel-feedback-list@broadcom.com,
linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org
Subject: [PATCH v2 05/21] staging: vc04_services: Delete blocked_count in struct vchiq_arm_state
Date: Fri, 31 Jan 2020 11:38:21 +0100 [thread overview]
Message-ID: <20200131103836.14312-6-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200131103836.14312-1-nsaenzjulienne@suse.de>
The variable is always 0. So delete it an all the code conditional to
it.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 --
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 9264bb5d0bbe..4545df573c90 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2266,8 +2266,6 @@ vchiq_videocore_wanted(struct vchiq_state *state)
if (!arm_state)
/* autosuspend not supported - always return wanted */
return 1;
- else if (arm_state->blocked_count)
- return 1;
else if (!arm_state->videocore_use_count)
/* usage count zero - check for override unless we're forcing */
return vchiq_platform_videocore_wanted(state);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index 6bab241313b8..35889a65b17f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -70,8 +70,6 @@ struct vchiq_arm_state {
*/
int peer_use_count;
- int blocked_count;
-
/* Flag to indicate that the first vchiq connect has made it through.
** This means that both sides should be fully ready, and we should
** be able to suspend after this point.
--
2.25.0
next prev parent reply other threads:[~2020-01-31 10:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-31 10:38 [PATCH v2 00/21] staging: vc04_services: suspend/resume cleanup Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 01/21] staging: vc04_services: Remove unused variables in struct vchiq_arm_state Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 02/21] staging: vc04_services: Get rid of resume_blocked " Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 03/21] staging: vc04_services: Get rid of resume_blocker completion " Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 04/21] staging: vc04_services: get rid of blocked_blocker " Nicolas Saenz Julienne
2020-01-31 10:38 ` Nicolas Saenz Julienne [this message]
2020-01-31 10:38 ` [PATCH v2 06/21] staging: vc04_services: get rid of vchiq_platform_use_suspend_timer() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 07/21] staging: vc04_services: Get rid of vchiq_platform_paused/resumed() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 08/21] staging: vc04_services: Get rid of vchiq_platform_suspend/resume() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 09/21] staging: vc04_services: Get rid of vchiq_platform_videocore_wanted() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 10/21] staging: vc04_services: Get rid of vchiq_platform_handle_timeout() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 11/21] staging: vc04_services: Get rid of vchiq_on_remote_use_active() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 12/21] staging: vc04_services: Get rid of vchiq_arm_vcsuspend() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 13/21] staging: vc04_services: Get rid of vchiq_check_resume() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 14/21] staging: vc04_services: Delete vc_suspend_complete completion Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 15/21] staging: vc04_services: Get rid of unused suspend/resume states Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 16/21] staging: vc04_services: Get of even more " Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 17/21] staging: vc04_services: Get rid of the rest of suspend/resume state handling Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 18/21] staging: vc04_services: Get rid of USE_TYPE_SERVICE_NO_RESUME Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 19/21] staging: vc04_services: Delete vchiq_platform_check_suspend() Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 20/21] staging: vc04_services: Get rid of vchiq_arm_vcresume()'s signature Nicolas Saenz Julienne
2020-01-31 10:38 ` [PATCH v2 21/21] staging: vc04_services: vchiq_arm: Get rid of unused defines Nicolas Saenz Julienne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200131103836.14312-6-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).