summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorValentin Ilie <valentin.ilie@gmail.com>2013-06-07 22:01:55 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-14 13:45:11 +0200
commitbda7eb27635c4d7414fb05a5f55501b71f436cc0 (patch)
treebae391b67d242d52c5632c45b8886bfad3367c4b /drivers/nfc
parent4ca546e5545b7345b69e9331ecd53a1e4c6f7fe1 (diff)
downloadlinux-bda7eb27635c4d7414fb05a5f55501b71f436cc0.tar.gz
linux-bda7eb27635c4d7414fb05a5f55501b71f436cc0.tar.bz2
linux-bda7eb27635c4d7414fb05a5f55501b71f436cc0.zip
NFC: mei_phy: Clean up file
Fix checkpatch warnings. Replace __attribute__((__packed__)) with __packed. Replace spaces with tabs. Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/mei_phy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c
index 1201bdbfb791..606bf55e76ec 100644
--- a/drivers/nfc/mei_phy.c
+++ b/drivers/nfc/mei_phy.c
@@ -30,7 +30,7 @@ struct mei_nfc_hdr {
u16 req_id;
u32 reserved;
u16 data_size;
-} __attribute__((packed));
+} __packed;
#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)
@@ -60,8 +60,8 @@ int nfc_mei_phy_enable(void *phy_id)
r = mei_cl_enable_device(phy->device);
if (r < 0) {
- pr_err("MEI_PHY: Could not enable device\n");
- return r;
+ pr_err("MEI_PHY: Could not enable device\n");
+ return r;
}
r = mei_cl_register_event_cb(phy->device, nfc_mei_event_cb, phy);