From: Shawn Guo <shawn.guo@linaro.org>
To: devicetree-discuss@lists.ozlabs.org, linux-mmc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, sameo@linux.intel.com,
linaro-dev@lists.linaro.org, patches@linaro.org,
Shawn Guo <shawn.guo@linaro.org>
Subject: [PATCH 5/5] mmc: sdhci: merge two sdhci-pltfm.h into one
Date: Fri, 25 Mar 2011 16:48:51 +0800 [thread overview]
Message-ID: <1301042931-4869-6-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1301042931-4869-1-git-send-email-shawn.guo@linaro.org>
The structure sdhci_pltfm_data is not necessarily to be in a public
header like include/linux/mmc/sdhci-pltfm.h, so the patch moves it
into drivers/mmc/host/sdhci-pltfm.h and eliminates the former one.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/mmc/host/sdhci-cns3xxx.c | 1 -
drivers/mmc/host/sdhci-esdhc.c | 1 -
drivers/mmc/host/sdhci-pltfm.h | 6 +++++-
include/linux/mmc/sdhci-pltfm.h | 29 -----------------------------
4 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 include/linux/mmc/sdhci-pltfm.h
diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c
index 95b9080..2238d34 100644
--- a/drivers/mmc/host/sdhci-cns3xxx.c
+++ b/drivers/mmc/host/sdhci-cns3xxx.c
@@ -15,7 +15,6 @@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/mmc/host.h>
-#include <linux/mmc/sdhci-pltfm.h>
#include <mach/cns3xxx.h>
#include "sdhci.h"
#include "sdhci-pltfm.h"
diff --git a/drivers/mmc/host/sdhci-esdhc.c b/drivers/mmc/host/sdhci-esdhc.c
index b3d1bc1..fd041d9 100644
--- a/drivers/mmc/host/sdhci-esdhc.c
+++ b/drivers/mmc/host/sdhci-esdhc.c
@@ -20,7 +20,6 @@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/mmc/host.h>
-#include <linux/mmc/sdhci-pltfm.h>
#ifdef CONFIG_MMC_SDHCI_ESDHC_IMX
#include <mach/hardware.h>
#endif
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
index 05fe25d..e2d143c 100644
--- a/drivers/mmc/host/sdhci-pltfm.h
+++ b/drivers/mmc/host/sdhci-pltfm.h
@@ -14,9 +14,13 @@
#include <linux/clk.h>
#include <linux/types.h>
#include <linux/platform_device.h>
-#include <linux/mmc/sdhci-pltfm.h>
#include <linux/mmc/sdhci.h>
+struct sdhci_pltfm_data {
+ struct sdhci_ops *ops;
+ unsigned int quirks;
+};
+
struct sdhci_pltfm_host {
struct clk *clk;
u32 scratchpad; /* to handle quirks across io-accessor calls */
diff --git a/include/linux/mmc/sdhci-pltfm.h b/include/linux/mmc/sdhci-pltfm.h
deleted file mode 100644
index f1c2ac3..0000000
--- a/include/linux/mmc/sdhci-pltfm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Platform data declarations for the sdhci-pltfm driver.
- *
- * Copyright (c) 2010 MontaVista Software, LLC.
- *
- * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- */
-
-#ifndef _SDHCI_PLTFM_H
-#define _SDHCI_PLTFM_H
-
-struct sdhci_ops;
-
-/**
- * struct sdhci_pltfm_data - SDHCI platform-specific information & hooks
- * @ops: optional pointer to the platform-provided SDHCI ops
- * @quirks: optional SDHCI quirks
- */
-struct sdhci_pltfm_data {
- struct sdhci_ops *ops;
- unsigned int quirks;
-};
-
-#endif /* _SDHCI_PLTFM_H */
--
1.7.1
next prev parent reply other threads:[~2011-03-25 8:46 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 8:48 [PATCH 0/5] consolidate sdhci pltfm & OF drivers and get them self registered Shawn Guo
2011-03-25 8:48 ` [PATCH 1/5] mmc: sdhci: make sdhci-pltfm device drivers " Shawn Guo
2011-03-31 15:33 ` Grant Likely
2011-04-01 6:10 ` Shawn Guo
2011-04-19 10:20 ` Wolfram Sang
2011-04-21 8:03 ` Shawn Guo
2011-04-21 9:57 ` Wolfram Sang
2011-03-25 8:48 ` [PATCH 2/5] mmc: sdhci: eliminate sdhci_of_host and sdhci_of_data Shawn Guo
2011-03-31 15:34 ` Grant Likely
2011-04-19 10:20 ` Wolfram Sang
2011-04-21 8:10 ` Shawn Guo
2011-03-25 8:48 ` [PATCH 3/5] mmc: sdhci: make sdhci-of device drivers self registered Shawn Guo
2011-03-31 15:38 ` Grant Likely
2011-04-19 10:21 ` Wolfram Sang
2011-04-21 8:17 ` Shawn Guo
2011-03-25 8:48 ` [PATCH 4/5] mmc: sdhci: consolidate sdhci-of-esdhc and sdhci-esdhc-imx Shawn Guo
2011-03-31 15:53 ` Grant Likely
2011-04-01 6:18 ` Shawn Guo
2011-04-19 10:21 ` Wolfram Sang
2011-04-21 8:53 ` Shawn Guo
2011-03-25 8:48 ` Shawn Guo [this message]
2011-03-31 15:54 ` [PATCH 5/5] mmc: sdhci: merge two sdhci-pltfm.h into one Grant Likely
2011-04-19 10:21 ` Wolfram Sang
2011-03-31 4:25 ` [PATCH 0/5] consolidate sdhci pltfm & OF drivers and get them self registered Shawn Guo
2011-03-31 16:36 ` Chris Ball
2011-04-13 6:26 ` Shawn Guo
2011-04-19 10:20 ` Wolfram Sang
2011-04-19 12:47 ` Kyungmin Park
2011-04-19 17:47 ` Wolfram Sang
2011-04-20 4:23 ` Kyungmin Park
2011-04-21 7:48 ` Shawn Guo
2011-04-26 13:20 ` 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=1301042931-4869-6-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linaro-dev@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=patches@linaro.org \
--cc=sameo@linux.intel.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).