Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94cc6a86 authored by Shawn Guo's avatar Shawn Guo Committed by Chris Ball
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 38576af1

drivers/mmc/host/sdhci-cns3xxx.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/mmc/host/sdhci-esdhc-imx.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/mmc/host/sdhci-pltfm.h

+5 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/mmc/sdhci-pltfm.h

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

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