From: Todd Poynor <toddpoynor@gmail.com>
To: Rob Springer <rspringer@google.com>,
John Joseph <jnjoseph@google.com>,
Ben Chan <benchan@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dmitry Torokhov <dtor@chromium.org>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Todd Poynor <toddpoynor@google.com>
Subject: [PATCH 7/8] staging: gasket: apex: drop reset type param
Date: Thu, 2 Aug 2018 01:42:44 -0700 [thread overview]
Message-ID: <20180802084245.239689-8-toddpoynor@gmail.com> (raw)
In-Reply-To: <20180802084245.239689-1-toddpoynor@gmail.com>
From: Todd Poynor <toddpoynor@google.com>
Apex doesn't implement different types of resets based on the reset type
param passed through the gasket layer or from userspace via the
gasket_reset ioctl. The reset type is dropped from the gasket framework
in a previous patch due to a lack of present need and non-conforming use
of this parameter by the framework. Drop the parameter from the apex
driver as well.
Signed-off-by: Todd Poynor <toddpoynor@google.com>
---
drivers/staging/gasket/apex_driver.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/gasket/apex_driver.c b/drivers/staging/gasket/apex_driver.c
index 7fd0dd609d037..42cef68eb4c19 100644
--- a/drivers/staging/gasket/apex_driver.c
+++ b/drivers/staging/gasket/apex_driver.c
@@ -56,10 +56,6 @@
#define APEX_EXTENDED_SHIFT 63 /* Extended address bit position. */
-enum apex_reset_types {
- APEX_CHIP_REINIT_RESET = 3,
-};
-
/* Check reset 120 times */
#define APEX_RESET_RETRY 120
/* Wait 100 ms between checks. Total 12 sec wait maximum. */
@@ -258,7 +254,7 @@ static int apex_get_status(struct gasket_dev *gasket_dev)
}
/* Enter GCB reset state. */
-static int apex_enter_reset(struct gasket_dev *gasket_dev, uint type)
+static int apex_enter_reset(struct gasket_dev *gasket_dev)
{
if (bypass_top_level)
return 0;
@@ -313,7 +309,7 @@ static int apex_enter_reset(struct gasket_dev *gasket_dev, uint type)
}
/* Quit GCB reset state. */
-static int apex_quit_reset(struct gasket_dev *gasket_dev, uint type)
+static int apex_quit_reset(struct gasket_dev *gasket_dev)
{
u32 val0, val1;
@@ -413,7 +409,7 @@ static int apex_device_cleanup(struct gasket_dev *gasket_dev)
__func__, gasket_dev, hib_error, scalar_error);
if (allow_power_save)
- ret = apex_enter_reset(gasket_dev, APEX_CHIP_REINIT_RESET);
+ ret = apex_enter_reset(gasket_dev);
return ret;
}
@@ -429,7 +425,7 @@ static bool is_gcb_in_reset(struct gasket_dev *gasket_dev)
}
/* Reset the hardware, then quit reset. Called on device open. */
-static int apex_reset(struct gasket_dev *gasket_dev, uint type)
+static int apex_reset(struct gasket_dev *gasket_dev)
{
int ret;
@@ -442,11 +438,11 @@ static int apex_reset(struct gasket_dev *gasket_dev, uint type)
*/
dev_dbg(gasket_dev->dev, "%s: toggle reset\n", __func__);
- ret = apex_enter_reset(gasket_dev, type);
+ ret = apex_enter_reset(gasket_dev);
if (ret)
return ret;
}
- ret = apex_quit_reset(gasket_dev, type);
+ ret = apex_quit_reset(gasket_dev);
return ret;
}
@@ -456,7 +452,7 @@ static int apex_add_dev_cb(struct gasket_dev *gasket_dev)
ulong page_table_ready, msix_table_ready;
int retries = 0;
- apex_reset(gasket_dev, 0);
+ apex_reset(gasket_dev);
while (retries < APEX_RESET_RETRY) {
page_table_ready =
@@ -611,7 +607,7 @@ static int apex_sysfs_setup_cb(struct gasket_dev *gasket_dev)
/* On device open, perform a core reinit reset. */
static int apex_device_open_cb(struct gasket_dev *gasket_dev)
{
- return gasket_reset_nolock(gasket_dev, APEX_CHIP_REINIT_RESET);
+ return gasket_reset_nolock(gasket_dev);
}
static const struct pci_device_id apex_pci_ids[] = {
--
2.18.0.597.ga71716f1ad-goog
next prev parent reply other threads:[~2018-08-02 8:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 8:42 [PATCH 0/8] staging: gasket: cleanups du jour Todd Poynor
2018-08-02 8:42 ` [PATCH 1/8] staging: gasket: apex: enable power save mode by default Todd Poynor
2018-08-02 8:42 ` [PATCH 2/8] staging: gasket: core: print driver version code at registration time Todd Poynor
2018-08-02 8:57 ` Greg Kroah-Hartman
2018-08-02 8:42 ` [PATCH 3/8] staging: gasket: core: move driver loaded log after error cases Todd Poynor
2018-08-02 8:57 ` Greg Kroah-Hartman
2018-08-02 8:42 ` [PATCH 4/8] staging: gasket: core: device register debug log cleanups Todd Poynor
2018-08-02 8:57 ` Greg Kroah-Hartman
2018-08-02 8:42 ` [PATCH 5/8] staging: gasket: core: add subsystem and device info to error logs Todd Poynor
2018-08-02 8:58 ` Greg Kroah-Hartman
2018-08-02 8:42 ` [PATCH 6/8] staging: gasket: remove "reset type" param from framework Todd Poynor
2018-08-02 8:42 ` Todd Poynor [this message]
2018-08-02 8:42 ` [PATCH 8/8] Revert "staging: gasket: core: hold reference to pci_dev while used" Todd Poynor
2018-08-02 9:00 ` Greg Kroah-Hartman
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=20180802084245.239689-8-toddpoynor@gmail.com \
--to=toddpoynor@gmail.com \
--cc=benchan@chromium.org \
--cc=devel@driverdev.osuosl.org \
--cc=dtor@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=jnjoseph@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rspringer@google.com \
--cc=toddpoynor@google.com \
/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
Powered by JetHome