LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Wolfram Sang <wsa@the-dreams.de>
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <wsa@the-dreams.de>,
	Vladimir Zapolskiy <vz@mleia.com>,
	Sylvain Lemieux <slemieux.tyco@gmail.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/7] i2c: pnx: move header into the driver
Date: Thu, 19 Apr 2018 22:00:13 +0200	[thread overview]
Message-ID: <20180419200015.15095-8-wsa@the-dreams.de> (raw)
In-Reply-To: <20180419200015.15095-1-wsa@the-dreams.de>

There are no platform_data users anymore. Move the structs into the
driver.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 drivers/i2c/busses/i2c-pnx.c | 21 ++++++++++++++++++++-
 include/linux/i2c-pnx.h      | 38 --------------------------------------
 2 files changed, 20 insertions(+), 39 deletions(-)
 delete mode 100644 include/linux/i2c-pnx.h

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index a542041df0cd..6e0e546ef83f 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -18,7 +18,6 @@
 #include <linux/timer.h>
 #include <linux/completion.h>
 #include <linux/platform_device.h>
-#include <linux/i2c-pnx.h>
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/clk.h>
@@ -29,6 +28,26 @@
 #define I2C_PNX_SPEED_KHZ_DEFAULT	100
 #define I2C_PNX_REGION_SIZE		0x100
 
+struct i2c_pnx_mif {
+	int			ret;		/* Return value */
+	int			mode;		/* Interface mode */
+	struct completion	complete;	/* I/O completion */
+	struct timer_list	timer;		/* Timeout */
+	u8 *			buf;		/* Data buffer */
+	int			len;		/* Length of data buffer */
+	int			order;		/* RX Bytes to order via TX */
+};
+
+struct i2c_pnx_algo_data {
+	void __iomem		*ioaddr;
+	struct i2c_pnx_mif	mif;
+	int			last;
+	struct clk		*clk;
+	struct i2c_adapter	adapter;
+	int			irq;
+	u32			timeout;
+};
+
 enum {
 	mstatus_tdi = 0x00000001,
 	mstatus_afi = 0x00000002,
diff --git a/include/linux/i2c-pnx.h b/include/linux/i2c-pnx.h
deleted file mode 100644
index 5388326fbbff..000000000000
--- a/include/linux/i2c-pnx.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Header file for I2C support on PNX010x/4008.
- *
- * Author: Dennis Kovalev <dkovalev@ru.mvista.com>
- *
- * 2004-2006 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifndef __I2C_PNX_H__
-#define __I2C_PNX_H__
-
-struct platform_device;
-struct clk;
-
-struct i2c_pnx_mif {
-	int			ret;		/* Return value */
-	int			mode;		/* Interface mode */
-	struct completion	complete;	/* I/O completion */
-	struct timer_list	timer;		/* Timeout */
-	u8 *			buf;		/* Data buffer */
-	int			len;		/* Length of data buffer */
-	int			order;		/* RX Bytes to order via TX */
-};
-
-struct i2c_pnx_algo_data {
-	void __iomem		*ioaddr;
-	struct i2c_pnx_mif	mif;
-	int			last;
-	struct clk		*clk;
-	struct i2c_adapter	adapter;
-	int			irq;
-	u32			timeout;
-};
-
-#endif /* __I2C_PNX_H__ */
-- 
2.11.0

  parent reply	other threads:[~2018-04-19 20:01 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-19 20:00 [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang
2018-04-19 20:00 ` [PATCH 1/7] i2c: i2c-gpio: move header to platform_data Wolfram Sang
2018-04-19 20:25   ` Tony Lindgren
2018-04-20  8:05   ` Lee Jones
2018-04-20 19:23   ` Robert Jarzmik
2018-05-05 13:26   ` Mauro Carvalho Chehab
2018-05-14 21:37   ` Wolfram Sang
2018-05-14 21:42     ` James Hogan
2018-05-14 23:03     ` Greg Ungerer
2018-04-19 20:00 ` [PATCH 2/7] i2c: i2c-mux-gpio: " Wolfram Sang
2018-04-20  5:25   ` Peter Korsgaard
2018-04-19 20:00 ` [PATCH 3/7] i2c: i2c-ocores: " Wolfram Sang
2018-04-20  8:05   ` Lee Jones
2018-04-19 20:00 ` [PATCH 4/7] i2c: i2c-omap: " Wolfram Sang
2018-04-19 20:25   ` Tony Lindgren
2018-04-19 20:00 ` [PATCH 5/7] i2c: i2c-pca-platform: " Wolfram Sang
2018-04-19 20:00 ` [PATCH 6/7] i2c: i2c-xiic: " Wolfram Sang
2018-04-20  8:05   ` Lee Jones
2018-04-19 20:00 ` Wolfram Sang [this message]
2018-04-19 20:49   ` [PATCH 7/7] i2c: pnx: move header into the driver Vladimir Zapolskiy
2018-05-17 14:32 ` [PATCH 0/7] i2c: clean up include/linux/i2c-* Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180419200015.15095-8-wsa@the-dreams.de \
    --to=wsa@the-dreams.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=slemieux.tyco@gmail.com \
    --cc=vz@mleia.com \
    --subject='Re: [PATCH 7/7] i2c: pnx: move header into the driver' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).