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 12/21] staging: vc04_services: Get rid of vchiq_arm_vcsuspend()
Date: Fri, 31 Jan 2020 11:38:28 +0100 [thread overview]
Message-ID: <20200131103836.14312-13-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200131103836.14312-1-nsaenzjulienne@suse.de>
It's not used.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
.../interface/vchiq_arm/vchiq_arm.c | 51 -------------------
.../interface/vchiq_arm/vchiq_arm.h | 3 --
2 files changed, 54 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 7c620366dfb6..a33f0fb5d45f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2500,57 +2500,6 @@ need_resume(struct vchiq_state *state)
(arm_state->vc_resume_state < VC_RESUME_REQUESTED);
}
-/* Initiate suspend via slot handler. Should be called with the write lock
- * held */
-enum vchiq_status
-vchiq_arm_vcsuspend(struct vchiq_state *state)
-{
- enum vchiq_status status = VCHIQ_ERROR;
- struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
-
- if (!arm_state)
- goto out;
-
- vchiq_log_trace(vchiq_susp_log_level, "%s", __func__);
- status = VCHIQ_SUCCESS;
-
- switch (arm_state->vc_suspend_state) {
- case VC_SUSPEND_REQUESTED:
- vchiq_log_info(vchiq_susp_log_level, "%s: suspend already "
- "requested", __func__);
- break;
- case VC_SUSPEND_IN_PROGRESS:
- vchiq_log_info(vchiq_susp_log_level, "%s: suspend already in "
- "progress", __func__);
- break;
-
- default:
- /* We don't expect to be in other states, so log but continue
- * anyway */
- vchiq_log_error(vchiq_susp_log_level,
- "%s unexpected suspend state %s", __func__,
- suspend_state_names[arm_state->vc_suspend_state +
- VC_SUSPEND_NUM_OFFSET]);
- /* fall through */
- case VC_SUSPEND_REJECTED:
- case VC_SUSPEND_FAILED:
- /* Ensure any idle state actions have been run */
- set_suspend_state(arm_state, VC_SUSPEND_IDLE);
- /* fall through */
- case VC_SUSPEND_IDLE:
- vchiq_log_info(vchiq_susp_log_level,
- "%s: suspending", __func__);
- set_suspend_state(arm_state, VC_SUSPEND_REQUESTED);
- /* kick the slot handler thread to initiate suspend */
- request_poll(state, NULL, 0);
- break;
- }
-
-out:
- vchiq_log_trace(vchiq_susp_log_level, "%s exit %d", __func__, status);
- return status;
-}
-
void
vchiq_platform_check_suspend(struct vchiq_state *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 0a4efcf95a61..606a519dd3db 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -88,9 +88,6 @@ int vchiq_platform_init(struct platform_device *pdev,
extern struct vchiq_state *
vchiq_get_state(void);
-extern enum vchiq_status
-vchiq_arm_vcsuspend(struct vchiq_state *state);
-
extern enum vchiq_status
vchiq_arm_vcresume(struct vchiq_state *state);
--
2.25.0
next prev parent reply other threads:[~2020-01-31 10:39 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 ` [PATCH v2 05/21] staging: vc04_services: Delete blocked_count " Nicolas Saenz Julienne
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 ` Nicolas Saenz Julienne [this message]
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-13-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).