lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sdhci: merge two sdhci-pltfm.h into one

Browse Source 
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>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Shawn Guo
2011-05-27 23:48:15 +08:00
committed by Chris Ball
parent 38576af1f8
commit 94cc6a8656
4 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mmc/host/sdhci-cns3xxx.c
View File

@@ -15,7 +15,6 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/sdhci-pltfm.h>
#include <mach/cns3xxx.h> #include <mach/cns3xxx.h>
#include "sdhci.h" #include "sdhci.h"
#include "sdhci-pltfm.h" #include "sdhci-pltfm.h"

1
drivers/mmc/host/sdhci-esdhc-imx.c
View File

@@ -18,7 +18,6 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/sdhci-pltfm.h>
#include <linux/mmc/mmc.h> #include <linux/mmc/mmc.h>
#include <linux/mmc/sdio.h> #include <linux/mmc/sdio.h>
#include <mach/hardware.h> #include <mach/hardware.h>

6
drivers/mmc/host/sdhci-pltfm.h
View File

@@ -14,9 +14,13 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/mmc/sdhci-pltfm.h>
#include <linux/mmc/sdhci.h> #include <linux/mmc/sdhci.h>
struct sdhci_pltfm_data {
struct sdhci_ops *ops;
unsigned int quirks;
};
struct sdhci_pltfm_host { struct sdhci_pltfm_host {
struct clk *clk; struct clk *clk;
void *priv; /* to handle quirks across io-accessor calls */ void *priv; /* to handle quirks across io-accessor calls */

29
include/linux/mmc/sdhci-pltfm.h
View File

@@ -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 */