* [PATCH 1/2] mmc: mvsdio: delete platform data header
@ 2015-11-25 13:57 Linus Walleij
2015-11-25 14:54 ` Andrew Lunn
2015-11-25 16:34 ` Ulf Hansson
0 siblings, 2 replies; 3+ messages in thread
From: Linus Walleij @ 2015-11-25 13:57 UTC (permalink / raw)
To: linux-mmc, Chris Ball, Ulf Hansson
Cc: Linus Walleij, Nicolas Pitre, Andrew Lunn, Sebastian Hesselbarth
This platform data struct is only used inside the MVSDIO driver,
nowhere else in the entire kernel. Move the struct into the
driver and delete the external header.
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/mmc/host/mvsdio.c | 7 ++++++-
include/linux/platform_data/mmc-mvsdio.h | 18 ------------------
2 files changed, 6 insertions(+), 19 deletions(-)
delete mode 100644 include/linux/platform_data/mmc-mvsdio.h
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a448498e3af2..18c70380ea93 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -28,7 +28,6 @@
#include <asm/sizes.h>
#include <asm/unaligned.h>
-#include <linux/platform_data/mmc-mvsdio.h>
#include "mvsdio.h"
@@ -37,6 +36,12 @@
static int maxfreq;
static int nodma;
+struct mvsdio_platform_data {
+ unsigned int clock;
+ int gpio_card_detect;
+ int gpio_write_protect;
+};
+
struct mvsd_host {
void __iomem *base;
struct mmc_request *mrq;
diff --git a/include/linux/platform_data/mmc-mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
deleted file mode 100644
index d02704cd3695..000000000000
--- a/include/linux/platform_data/mmc-mvsdio.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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 __MMC_MVSDIO_H
-#define __MMC_MVSDIO_H
-
-#include <linux/mbus.h>
-
-struct mvsdio_platform_data {
- unsigned int clock;
- int gpio_card_detect;
- int gpio_write_protect;
-};
-
-#endif
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] mmc: mvsdio: delete platform data header
2015-11-25 13:57 [PATCH 1/2] mmc: mvsdio: delete platform data header Linus Walleij
@ 2015-11-25 14:54 ` Andrew Lunn
2015-11-25 16:34 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Lunn @ 2015-11-25 14:54 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-mmc, Chris Ball, Ulf Hansson, Nicolas Pitre,
Sebastian Hesselbarth
On Wed, Nov 25, 2015 at 02:57:31PM +0100, Linus Walleij wrote:
> This platform data struct is only used inside the MVSDIO driver,
> nowhere else in the entire kernel. Move the struct into the
> driver and delete the external header.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Probably a side effect of moving all kirkwood and Dove devices to
device tree.
Acked-by: Andrew Lunn <andrew@lunn.ch>
Andrew
> ---
> drivers/mmc/host/mvsdio.c | 7 ++++++-
> include/linux/platform_data/mmc-mvsdio.h | 18 ------------------
> 2 files changed, 6 insertions(+), 19 deletions(-)
> delete mode 100644 include/linux/platform_data/mmc-mvsdio.h
>
> diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
> index a448498e3af2..18c70380ea93 100644
> --- a/drivers/mmc/host/mvsdio.c
> +++ b/drivers/mmc/host/mvsdio.c
> @@ -28,7 +28,6 @@
>
> #include <asm/sizes.h>
> #include <asm/unaligned.h>
> -#include <linux/platform_data/mmc-mvsdio.h>
>
> #include "mvsdio.h"
>
> @@ -37,6 +36,12 @@
> static int maxfreq;
> static int nodma;
>
> +struct mvsdio_platform_data {
> + unsigned int clock;
> + int gpio_card_detect;
> + int gpio_write_protect;
> +};
> +
> struct mvsd_host {
> void __iomem *base;
> struct mmc_request *mrq;
> diff --git a/include/linux/platform_data/mmc-mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
> deleted file mode 100644
> index d02704cd3695..000000000000
> --- a/include/linux/platform_data/mmc-mvsdio.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/*
> - * 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 __MMC_MVSDIO_H
> -#define __MMC_MVSDIO_H
> -
> -#include <linux/mbus.h>
> -
> -struct mvsdio_platform_data {
> - unsigned int clock;
> - int gpio_card_detect;
> - int gpio_write_protect;
> -};
> -
> -#endif
> --
> 2.4.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] mmc: mvsdio: delete platform data header
2015-11-25 13:57 [PATCH 1/2] mmc: mvsdio: delete platform data header Linus Walleij
2015-11-25 14:54 ` Andrew Lunn
@ 2015-11-25 16:34 ` Ulf Hansson
1 sibling, 0 replies; 3+ messages in thread
From: Ulf Hansson @ 2015-11-25 16:34 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-mmc, Chris Ball, Nicolas Pitre, Andrew Lunn,
Sebastian Hesselbarth
On 25 November 2015 at 14:57, Linus Walleij <linus.walleij@linaro.org> wrote:
> This platform data struct is only used inside the MVSDIO driver,
> nowhere else in the entire kernel. Move the struct into the
> driver and delete the external header.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Thanks, applied for next!
Kind regards
Uffe
> ---
> drivers/mmc/host/mvsdio.c | 7 ++++++-
> include/linux/platform_data/mmc-mvsdio.h | 18 ------------------
> 2 files changed, 6 insertions(+), 19 deletions(-)
> delete mode 100644 include/linux/platform_data/mmc-mvsdio.h
>
> diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
> index a448498e3af2..18c70380ea93 100644
> --- a/drivers/mmc/host/mvsdio.c
> +++ b/drivers/mmc/host/mvsdio.c
> @@ -28,7 +28,6 @@
>
> #include <asm/sizes.h>
> #include <asm/unaligned.h>
> -#include <linux/platform_data/mmc-mvsdio.h>
>
> #include "mvsdio.h"
>
> @@ -37,6 +36,12 @@
> static int maxfreq;
> static int nodma;
>
> +struct mvsdio_platform_data {
> + unsigned int clock;
> + int gpio_card_detect;
> + int gpio_write_protect;
> +};
> +
> struct mvsd_host {
> void __iomem *base;
> struct mmc_request *mrq;
> diff --git a/include/linux/platform_data/mmc-mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
> deleted file mode 100644
> index d02704cd3695..000000000000
> --- a/include/linux/platform_data/mmc-mvsdio.h
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -/*
> - * 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 __MMC_MVSDIO_H
> -#define __MMC_MVSDIO_H
> -
> -#include <linux/mbus.h>
> -
> -struct mvsdio_platform_data {
> - unsigned int clock;
> - int gpio_card_detect;
> - int gpio_write_protect;
> -};
> -
> -#endif
> --
> 2.4.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-25 16:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-25 13:57 [PATCH 1/2] mmc: mvsdio: delete platform data header Linus Walleij
2015-11-25 14:54 ` Andrew Lunn
2015-11-25 16:34 ` Ulf Hansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.