aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2016-10-19 16:33:30 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-28 08:21:22 -0400
commit972cedf6e39a49a79a66cd7f46132d21369d0083 (patch)
treee0eb9cf51a5e8cd7ab261e4b94c5a967ded2c3f8 /drivers/nfc
parentnfc: mei: use module_mei_cl_driver macro (diff)
downloadlinux-dev-972cedf6e39a49a79a66cd7f46132d21369d0083.tar.xz
linux-dev-972cedf6e39a49a79a66cd7f46132d21369d0083.zip
nfc: mei_phy: get phy from the driver data
In order to remove rather redundant context from the callback signature we the get nfc mei_phy from the driver's data. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/mei_phy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
index 83deda4bb4d6..66dfd81ffb18 100644
--- a/drivers/nfc/mei_phy.c
+++ b/drivers/nfc/mei_phy.c
@@ -300,7 +300,10 @@ static int mei_nfc_recv(struct nfc_mei_phy *phy, u8 *buf, size_t length)
static void nfc_mei_event_cb(struct mei_cl_device *cldev, u32 events,
void *context)
{
- struct nfc_mei_phy *phy = context;
+ struct nfc_mei_phy *phy = mei_cldev_get_drvdata(cldev);
+
+ if (!phy)
+ return;
if (phy->hard_fault != 0)
return;