nfc: mrvl: Move platform_data struct into driver

There are no users of nfcmrvl platform_data struct outside of the
driver and none will be added, so move it into the driver.

Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index 165bd0a95190b1cf8e79c683a666e0905d10490e..0f22b3233f7339b0001dfc6cee84a8ebd44e83f5 100644 (file)
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -8,8 +8,6 @@
 #ifndef _NFCMRVL_H_
 #define _NFCMRVL_H_
 
-#include <linux/platform_data/nfcmrvl.h>
-
 #include "fw_dnld.h"
 
 /* Define private flags: */
@@ -50,6 +48,34 @@ enum nfcmrvl_phy {
        NFCMRVL_PHY_SPI         = 3,
 };
 
+struct nfcmrvl_platform_data {
+       /*
+        * Generic
+        */
+
+       /* GPIO that is wired to RESET_N signal */
+       int reset_n_io;
+       /* Tell if transport is muxed in HCI one */
+       unsigned int hci_muxed;
+
+       /*
+        * UART specific
+        */
+
+       /* Tell if UART needs flow control at init */
+       unsigned int flow_control;
+       /* Tell if firmware supports break control for power management */
+       unsigned int break_control;
+
+
+       /*
+        * I2C specific
+        */
+
+       unsigned int irq;
+       unsigned int irq_polarity;
+};
+
 struct nfcmrvl_private {
 
        unsigned long flags;

diff --git a/include/linux/platform_data/nfcmrvl.h b/include/linux/platform_data/nfcmrvl.h
deleted file mode 100644 (file)
index 9e75ac8..0000000
--- a/include/linux/platform_data/nfcmrvl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2015, Marvell International Ltd.
- *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License").  You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
- * this warranty disclaimer.
- */
-
-#ifndef _NFCMRVL_PTF_H_
-#define _NFCMRVL_PTF_H_
-
-struct nfcmrvl_platform_data {
-       /*
-        * Generic
-        */
-
-       /* GPIO that is wired to RESET_N signal */
-       int reset_n_io;
-       /* Tell if transport is muxed in HCI one */
-       unsigned int hci_muxed;
-
-       /*
-        * UART specific
-        */
-
-       /* Tell if UART needs flow control at init */
-       unsigned int flow_control;
-       /* Tell if firmware supports break control for power management */
-       unsigned int break_control;
-
-
-       /*
-        * I2C specific
-        */
-
-       unsigned int irq;
-       unsigned int irq_polarity;
-};
-
-#endif /* _NFCMRVL_PTF_H_ */