Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1204343 > unrolled thread

[PATCH] can: at91: move at91_can_data to at91_can.c

Back to article view | Back to linux.kernel

Contents

  [PATCH] can: at91: move at91_can_data to at91_can.c Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-08-10 16:50 +0200
    Re: [PATCH] can: at91: move at91_can_data to at91_can.c Marc Kleine-Budde <mkl@pengutronix.de> - 2015-08-13 12:20 +0200

#1204343 — [PATCH] can: at91: move at91_can_data to at91_can.c

struct at91_can_data is now only used inside the driver, move it to
its c file.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
 drivers/net/can/at91_can.c          | 5 ++++-
 include/linux/platform_data/atmel.h | 5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index 945c0955a967..83ddf4f46f0d 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -33,7 +33,6 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/platform_data/atmel.h>
 
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
@@ -136,6 +135,10 @@ struct at91_devtype_data {
 	enum at91_devtype type;
 };
 
+struct at91_can_data {
+	void (*transceiver_switch)(int on);
+};
+
 struct at91_priv {
 	struct can_priv can;		/* must be the first member! */
 	struct napi_struct napi;
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index 4b452c6a2f7b..b99d85f56a7d 100644
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -86,11 +86,6 @@ struct atmel_uart_data {
 	struct serial_rs485	rs485;		/* rs485 settings */
 };
 
-/* CAN */
-struct at91_can_data {
-	void (*transceiver_switch)(int on);
-};
-
 /* FIXME: this needs a better location, but gets stuff building again */
 extern int at91_suspend_entering_slow_clock(void);
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1206680

[Multipart message — attachments visible in raw view] — view raw

On 08/10/2015 04:44 PM, Alexandre Belloni wrote:
> struct at91_can_data is now only used inside the driver, move it to
> its c file.

It was supposed to be the interface between the board and the CAN
driver. In commit 4403ac46edcdb51e92d36ad9f00ea3bbb766342e the
at91sam9263 board was removed. As the driver has no support for DT
transceiver switch, this functionality was lost. We should either remove
the transceiver support or add a DT regulator for this.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web