Selaa lähdekoodia

NFC: Driver: NFC Driver compilation issues on Pineapple

Added fix for compilation issue on Pineapple.

Change-Id: I8d39dbec75af8e44e6478b7d06e886196e1624fe
Khageswararao Rao B 2 vuotta sitten
vanhempi
sitoutus
c755b03abb
4 muutettua tiedostoa jossa 7 lisäystä ja 5 poistoa
  1. 1 1
      nfc/common.h
  2. 3 2
      nfc/common_nxp.c
  3. 2 1
      nfc/ese_cold_reset.c
  4. 1 1
      nfc_kernel_dlkm_vendor_board.mk

+ 1 - 1
nfc/common.h

@@ -145,7 +145,7 @@ do { \
 } while (0)
 
 static struct semaphore sem_eSE_pwr_off;
-static chk_eSE_pwr_off;
+static bool chk_eSE_pwr_off;
 
 enum ese_ioctl_request {
 	/* eSE POWER ON */

+ 3 - 2
nfc/common_nxp.c

@@ -253,7 +253,7 @@ static bool validate_download_gpio(struct nfc_dev *nfc_dev, enum chip_types chip
 	struct platform_gpio *nfc_gpio;
 
 	if (nfc_dev == NULL) {
-		pr_err("%s nfc devices structure is null\n");
+		pr_err("%s nfc devices structure is null\n", __func__);
 		return status;
 	}
 	nfc_gpio = &nfc_dev->configs.gpio;
@@ -312,9 +312,10 @@ int nfcc_hw_check(struct nfc_dev *nfc_dev)
 	switch (nfc_state) {
 	case NFC_STATE_FW_TEARED:
 		pr_warn("%s: - NFCC FW Teared State\n", __func__);
+             break;
 	case NFC_STATE_FW_DWL:
 	case NFC_STATE_NCI:
-		break;
+	     break;
 	case NFC_STATE_UNKNOWN:
 	default:
 		ret = -ENXIO;

+ 2 - 1
nfc/ese_cold_reset.c

@@ -284,7 +284,8 @@ int ese_cold_reset_ioctl(struct nfc_dev *nfc_dev, unsigned long arg)
 			/* free buffers and exit with pass */
 			goto err;
 		}
-
+		/* Temp fix to  avoid compilation issues */
+                break;
 	case ESE_COLD_RESET_PROTECT_DIS:
 
 		if (nfc_dev->cold_reset.is_crp_en &&

+ 1 - 1
nfc_kernel_dlkm_vendor_board.mk

@@ -1,5 +1,5 @@
 # Build NFC kernel driver
-ifeq ($(call is-board-platform-in-list, kalama bengal),true)
+ifeq ($(call is-board-platform-in-list, pineapple),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nxp-nci.ko
 endif