2012-10-24 18:45:36

by Marcel Holtmann

Subject: [PATCH 2/3] NFC: Move pn544.h to linux/platform_data/

The pn544.h just provides the platform data struct and defines and
nothing else. So move it to to linux/platform_data/ now.

Signed-off-by: Marcel Holtmann <[email protected]>
---
drivers/nfc/pn544_hci.c | 2 +-
include/linux/nfc/pn544.h | 44 -------------------------------------
include/linux/platform_data/pn544.h | 44 +++++++++++++++++++++++++++++++++++++
3 files changed, 45 insertions(+), 45 deletions(-)
delete mode 100644 include/linux/nfc/pn544.h
create mode 100644 include/linux/platform_data/pn544.h

diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c
index c9c8570..ae5d5f7 100644
--- a/drivers/nfc/pn544_hci.c
+++ b/drivers/nfc/pn544_hci.c
@@ -31,7 +31,7 @@
#include <net/nfc/hci.h>
#include <net/nfc/llc.h>

-#include <linux/nfc/pn544.h>
+#include <linux/platform_data/pn544.h>

#define DRIVER_DESC "HCI NFC driver for PN544"

diff --git a/include/linux/nfc/pn544.h b/include/linux/nfc/pn544.h
deleted file mode 100644
index 713bfd7..0000000
--- a/include/linux/nfc/pn544.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Driver include for the PN544 NFC chip.
- *
- * Copyright (C) Nokia Corporation
- *
- * Author: Jari Vanhala <[email protected]>
- * Contact: Matti Aaltoenn <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _PN544_H_
-#define _PN544_H_
-
-#include <linux/i2c.h>
-
-enum {
- NFC_GPIO_ENABLE,
- NFC_GPIO_FW_RESET,
- NFC_GPIO_IRQ
-};
-
-/* board config */
-struct pn544_nfc_platform_data {
- int (*request_resources) (struct i2c_client *client);
- void (*free_resources) (void);
- void (*enable) (int fw);
- int (*test) (void);
- void (*disable) (void);
- int (*get_gpio)(int type);
-};
-
-#endif /* _PN544_H_ */
diff --git a/include/linux/platform_data/pn544.h b/include/linux/platform_data/pn544.h
new file mode 100644
index 0000000..713bfd7
--- /dev/null
+++ b/include/linux/platform_data/pn544.h
@@ -0,0 +1,44 @@
+/*
+ * Driver include for the PN544 NFC chip.
+ *
+ * Copyright (C) Nokia Corporation
+ *
+ * Author: Jari Vanhala <[email protected]>
+ * Contact: Matti Aaltoenn <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef _PN544_H_
+#define _PN544_H_
+
+#include <linux/i2c.h>
+
+enum {
+ NFC_GPIO_ENABLE,
+ NFC_GPIO_FW_RESET,
+ NFC_GPIO_IRQ
+};
+
+/* board config */
+struct pn544_nfc_platform_data {
+ int (*request_resources) (struct i2c_client *client);
+ void (*free_resources) (void);
+ void (*enable) (int fw);
+ int (*test) (void);
+ void (*disable) (void);
+ int (*get_gpio)(int type);
+};
+
+#endif /* _PN544_H_ */
--
1.7.11.7

2012-10-29 11:00:31

by Samuel Ortiz

Subject: Re: [PATCH 2/3] NFC: Move pn544.h to linux/platform_data/

Hi Marcel,

On Wed, Oct 24, 2012 at 11:45:26AM -0700, Marcel Holtmann wrote:
> The pn544.h just provides the platform data struct and defines and
> nothing else. So move it to to linux/platform_data/ now.
>
> Signed-off-by: Marcel Holtmann <[email protected]>
> ---
> drivers/nfc/pn544_hci.c | 2 +-
> include/linux/nfc/pn544.h | 44 -------------------------------------
> include/linux/platform_data/pn544.h | 44 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 45 insertions(+), 45 deletions(-)
> delete mode 100644 include/linux/nfc/pn544.h
> create mode 100644 include/linux/platform_data/pn544.h
We moved the pn544 driver into his own directory, so I applied this patch to
my nfc-next branch after fixing it up.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/