mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
mmc: sdhci: merge two sdhci-pltfm.h into one
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:
parent
38576af1f8
commit
94cc6a8656
4 changed files with 5 additions and 32 deletions
|
@ -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"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mmc/host.h>
|
||||
#include <linux/mmc/sdhci-pltfm.h>
|
||||
#include <linux/mmc/mmc.h>
|
||||
#include <linux/mmc/sdio.h>
|
||||
#include <mach/hardware.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;
|
||||
void *priv; /* to handle quirks across io-accessor calls */
|
||||
|
|
|
@ -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 */
|
Loading…
Reference in a new issue