Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965436AbcCNPps (ORCPT ); Mon, 14 Mar 2016 11:45:48 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35732 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934550AbcCNPpn (ORCPT ); Mon, 14 Mar 2016 11:45:43 -0400 From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: Sameer Nanda , Javier Martinez Canillas , Lee Jones , Benson Leung , =?UTF-8?q?Enric=20Balletb=C3=B2?= , Vic Yang , Stephen Boyd , Vincent Palatin , Randall Spangler , Todd Broch , Gwendal Grignou , Tomeu Vizoso , Olof Johansson Subject: [PATCH v5 2/6] mfd: cros_ec: Add cros_ec_cmd_xfer_status helper Date: Mon, 14 Mar 2016 16:44:57 +0100 Message-Id: <1457970301-24616-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457970301-24616-1-git-send-email-tomeu.vizoso@collabora.com> References: <1457970301-24616-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2488 Lines: 77 So that callers of cros_ec_cmd_xfer don't have to repeat boilerplate code when checking for errors from the EC side. Signed-off-by: Tomeu Vizoso --- Changes in v5: - Check explicitly for !EC_RES_SUCCESS as suggested by Benson Leung. Changes in v4: None Changes in v3: None Changes in v2: None drivers/platform/chrome/cros_ec_proto.c | 14 ++++++++++++++ include/linux/mfd/cros_ec.h | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c index c792e116e621..aaccdde1c9d5 100644 --- a/drivers/platform/chrome/cros_ec_proto.c +++ b/drivers/platform/chrome/cros_ec_proto.c @@ -472,3 +472,17 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev) return get_keyboard_state_event(ec_dev); } EXPORT_SYMBOL(cros_ec_get_next_event); + +int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev, + struct cros_ec_command *msg) +{ + int ret = cros_ec_cmd_xfer(ec_dev, msg); + + if (ret < 0) + dev_err(ec_dev->dev, "Command xfer error (err:%d)\n", ret); + else if (msg->result != EC_RES_SUCCESS) + return -EECRESULT - msg->result; + + return ret; +} +EXPORT_SYMBOL(cros_ec_cmd_xfer_status); diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index 1f88418a36cf..b6961c717209 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h @@ -40,6 +40,9 @@ #define EC_MAX_REQUEST_OVERHEAD 1 #define EC_MAX_RESPONSE_OVERHEAD 2 +/* ec_command return value for non-success result from EC */ +#define EECRESULT 1000 + /* * Command interface between EC and AP, for LPC, I2C and SPI interfaces. */ @@ -250,6 +253,21 @@ int cros_ec_cmd_xfer(struct cros_ec_device *ec_dev, struct cros_ec_command *msg); /** + * cros_ec_cmd_xfer_status - Send a command to the ChromeOS EC + * + * This function is identical to cros_ec_cmd_xfer, except it returns succes + * status only if both the command was transmitted successfully and the EC + * replied with success status. It's not necessary to check msg->result when + * using this function. + * + * @ec_dev: EC device + * @msg: Message to write + * @return: Num. of bytes transferred on success, <0 on failure + */ +int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev, + struct cros_ec_command *msg); + +/** * cros_ec_remove - Remove a ChromeOS EC * * Call this to deregister a ChromeOS EC, then clean up any private data. -- 2.5.0