From: Tomas Winkler <tomas.winkler@intel.com>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, alan@linux.intel.com,
linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [char-misc-next 07/21] mei: drop read_pending member form struct mei_cl
Date: Tue, 8 Jan 2013 23:07:18 +0200 [thread overview]
Message-ID: <1357679252-12958-8-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1357679252-12958-1-git-send-email-tomas.winkler@intel.com>
read_pending never changes, it is a leftover from the old code.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/client.c | 2 +-
drivers/misc/mei/main.c | 4 +---
drivers/misc/mei/mei_dev.h | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index e2e9cb7..231eda2 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -631,7 +631,7 @@ int mei_cl_read_start(struct mei_cl *cl)
if (dev->dev_state != MEI_DEV_ENABLED)
return -ENODEV;
- if (cl->read_pending || cl->read_cb) {
+ if (cl->read_cb) {
dev_dbg(&dev->pdev->dev, "read is pending.\n");
return -EBUSY;
}
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index e31ade3..5c7c855 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -380,7 +380,6 @@ free:
mei_io_cb_free(cb);
cl->reading_state = MEI_IDLE;
cl->read_cb = NULL;
- cl->read_pending = 0;
out:
dev_dbg(&dev->pdev->dev, "end mei read rets= %d\n", rets);
mutex_unlock(&dev->device_lock);
@@ -462,9 +461,8 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
write_cb = NULL;
cl->reading_state = MEI_IDLE;
cl->read_cb = NULL;
- cl->read_pending = 0;
}
- } else if (cl->reading_state == MEI_IDLE && !cl->read_pending)
+ } else if (cl->reading_state == MEI_IDLE)
*offset = 0;
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 87b1f6a..11ff875 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -199,7 +199,6 @@ struct mei_cl {
wait_queue_head_t tx_wait;
wait_queue_head_t rx_wait;
wait_queue_head_t wait;
- int read_pending;
int status;
/* ID of client connected */
u8 host_client_id;
--
1.7.4.4
next prev parent reply other threads:[~2013-01-08 21:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-08 21:07 [char-misc-next 00/21] MEI restructuring Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 01/21] mei: add new hbm.h header to export hbm protocol Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 02/21] mei: move client functions to client.c Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 03/21] mei: fix client functions names Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 04/21] mei: implement mei_cl_connect function Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 05/21] mei: move watchdog prototypes to mei_dev.h from interface.h Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 06/21] mei: rename interface to hw-me Tomas Winkler
2013-01-08 21:07 ` Tomas Winkler [this message]
2013-01-08 21:07 ` [char-misc-next 08/21] mei: move me client storage allocation to hbm.c Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 09/21] mei: mei_dev.h - remove prototypes of dropped functions Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 10/21] mei: rename remaining amthi strings to amthif Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 11/21] mei: normalize me host client linking routines Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 12/21] mei: move MEI_IAMTHIF_IDLE to amthif host init function Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 13/21] mei: hw-me.c fix kernel doc Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 14/21] mei: remove write only need_reset member of struct mei_device Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 15/21] mei: remove mei_csr_clear_his prototype Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 16/21] mei: don't use cached value for hcsr in mei_hw_reset Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 17/21] mei: use non cached hcsr for interrupt enablement Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 18/21] mei: abstract host and device readieness Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 19/21] mei: reenable mei_hcsr_set abstraction Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 20/21] mei: make host csr and me csr internal to hw-me Tomas Winkler
2013-01-08 21:07 ` [char-misc-next 21/21] mei: move work initialization to mei_device_init Tomas Winkler
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=1357679252-12958-8-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=alan@linux.intel.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®