OSDN Git Service

NFC: nxp-nci: Include unaligned.h instead of access_ok.h
authorGuenter Roeck <linux@roeck-us.net>
Sat, 1 Aug 2015 13:59:29 +0000 (06:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Feb 2019 09:13:20 +0000 (10:13 +0100)
commit2a41ed30abe710f39717e42e76a8466c15965eee
tree32fb8e6edf2844a11a3a032219f78e0dbf26ae92
parentb661fff5f8a0f19824df91cc3905ba2c5b54dc87
NFC: nxp-nci: Include unaligned.h instead of access_ok.h

commit 2eee74b7e2a496dea49847c36fd09320505f45b7 upstream.

Directly including access_ok.h can result in the following compile errors
if an architecture such as ia64 does not support direct unaligned accesses.

include/linux/unaligned/access_ok.h:7:19: error:
redefinition of 'get_unaligned_le16'
include/linux/unaligned/le_struct.h:6:19: note:
previous definition of 'get_unaligned_le16' was here
include/linux/unaligned/access_ok.h:12:19: error:
redefinition of 'get_unaligned_le32'
include/linux/unaligned/le_struct.h:11:19: note:
previous definition of 'get_unaligned_le32' was here

Include asm/unaligned.h instead and let the architecture decide which
access functions to use.

Cc: Clément Perrochaud <clement.perrochaud@effinnov.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nfc/nxp-nci/firmware.c
drivers/nfc/nxp-nci/i2c.c