mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tomas Winkler <tomas.winkler@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alexander Usyskin <alexander.usyskin@intel.com>,
	linux-kernel@vger.kernel.org,
	Tomas Winkler <tomas.winkler@intel.com>
Subject: [char-misc-next 6/7] mei: amthif: use mei_cl_alloc_cb for allocating cbs
Date: Tue, 24 May 2016 16:03:40 -0400	[thread overview]
Message-ID: <1464120221-28151-7-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1464120221-28151-1-git-send-email-tomas.winkler@intel.com>

From: Alexander Usyskin <alexander.usyskin@intel.com>

Use mei_cl_alloc_cb wrapper instead of open code steps

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/amthif.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c
index 9885fa40a120..14b454143c81 100644
--- a/drivers/misc/mei/amthif.c
+++ b/drivers/misc/mei/amthif.c
@@ -196,17 +196,10 @@ static int mei_amthif_read_start(struct mei_cl *cl, const struct file *file)
 {
 	struct mei_device *dev = cl->dev;
 	struct mei_cl_cb *cb;
-	int rets;
-
-	cb = mei_io_cb_init(cl, MEI_FOP_READ, file);
-	if (!cb) {
-		rets = -ENOMEM;
-		goto err;
-	}
 
-	rets = mei_io_cb_alloc_buf(cb, mei_cl_mtu(cl));
-	if (rets)
-		goto err;
+	cb = mei_cl_alloc_cb(cl, mei_cl_mtu(cl), MEI_FOP_READ, file);
+	if (!cb)
+		return -ENOMEM;
 
 	list_add_tail(&cb->list, &dev->ctrl_wr_list.list);
 
@@ -214,9 +207,6 @@ static int mei_amthif_read_start(struct mei_cl *cl, const struct file *file)
 	dev->iamthif_fp = cb->fp;
 
 	return 0;
-err:
-	mei_io_cb_free(cb);
-	return rets;
 }
 
 /**
-- 
2.5.5

  parent reply	other threads:[~2016-05-24 13:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-24 20:03 [char-misc-next 0/7] mei: amthif fixes and cleanups Tomas Winkler
2016-05-24 20:03 ` [char-misc-next 1/7] mei: amthif: drop READ_COMPLETE state Tomas Winkler
2016-05-24 20:03 ` [char-misc-next 2/7] mei: amthif: fix request cancel Tomas Winkler
2016-05-24 20:03 ` [char-misc-next 3/7] mei: amthif: drop iamthif_current_cb Tomas Winkler
2016-05-24 20:03 ` [char-misc-next 4/7] mei: amthif: enable poll for async events Tomas Winkler
2016-05-24 20:03 ` [char-misc-next 5/7] mei: amthif: drop mei_amthif_send_cmd Tomas Winkler
2016-05-24 20:03 ` Tomas Winkler [this message]
2016-05-24 20:03 ` [char-misc-next 7/7] mei: drop mei_io_cb_alloc_buf 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=1464120221-28151-7-git-send-email-tomas.winkler@intel.com \
    --to=tomas.winkler@intel.com \
    --cc=alexander.usyskin@intel.com \
    --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®