Patch "nfc: st-nci: Remove duplicate file platform_data/st_nci.h" has been added to the 4.2-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
nfc: st-nci: Remove duplicate file platform_data/st_nci.h
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfc-st-nci-remove-duplicate-file-platform_data-st_nci.h.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
76b733d15874128ee2d0365b4cbe7d51decd8d37Mon Sep 17 00:00:00 2001
From: Christophe Ricard <[email protected]>
Date: Fri, 14 Aug 2015 22:33:30 +0200
Subject: nfc: st-nci: Remove duplicate file platform_data/st_nci.h
From: Christophe Ricard <[email protected]>
commit 76b733d15874128ee2d0365b4cbe7d51decd8d37 upstream.
commit "nfc: st-nci: Rename st21nfcb to st-nci" adds include/linux/platform_data/st_nci.h duplicated with include/linux/platform_data/st-nci.h.
Only drivers/nfc/st-nci/i2c.c uses platform_data/st_nci.h.
--- drivers/nfc/st-nci/i2c.c | 2 +- include/linux/platform_data/st_nci.h | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-)
drivers/nfc/st-nci/i2c.c +1 -1
@@ -25,7 +25,7 @@#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/nfc.h> -#include <linux/platform_data/st_nci.h> +#include <linux/platform_data/st-nci.h> #include "ndlc.h"
include/linux/platform_data/st_nci.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* Driver include for ST NCI NFC chip family. -* -* Copyright (C) 2014-2015 STMicroelectronics SAS. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef _ST_NCI_H_ -#define _ST_NCI_H_ - -#define ST_NCI_DRIVER_NAME "st_nci" - -struct st_nci_nfc_platform_data { -unsigned int gpio_reset; -unsigned int irq_polarity; -}; - -#endif /* _ST_NCI_H_ */
Patches currently in stable-queue which might be from [email protected] are
queue-4.2/nfc-st-nci-fix-typo-when-changing-from-st21nfcb-to-st-nci.patch queue-4.2/nfc-st-nci-remove-duplicate-file-platform_data-st_nci.h.patch queue-4.2/nfc-st-nci-fix-non-accurate-comment-for-st_nci_i2c_read.patch queue-4.2/nfc-st-nci-free-data-with-irrelevant-ndlc-pcb_sync-value.patch queue-4.2/nfc-st-nci-fix-use-of-uninitialized-variables-in-error-path.patch queue-4.2/nfc-netlink-warning-fix.patch queue-4.2/nfc-st-nci-remove-data-from-ack_pending_q-when-receiving-a-sync_ack.patch queue-4.2/nfc-netlink-add-check-on-nfc_attr_vendor_data.patch queue-4.2/nfc-nci-hci-add-check-on-skb-nci_hci_send_cmd-parameter.patch queue-4.2/nfc-st21nfca-fix-use-of-uninitialized-variables-in-error-path.patch