| Message ID | 1448459851-32565-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | New |
| Headers | show |
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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
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 -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html