From 761edb8bf7a03a72ae12adbf1ab64bde92f2cb8c Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 4 May 2016 11:05:15 +0530 Subject: Revert "ARM: Add 'card_present' state to mmc_platfrom_data" This reverts commit 541632275e983573b8250fcd4402f772d7bd1e6f. mmc_platform_data (or arch/arm/include/asm/mach/mmc.h in general) has no active user in android-4.x kernels. Also all the necessary bits are already moved to include/linux/amba/mmci.h. 6ef297f86b62 (ARM: 5720/1: Move MMCI header to amba include dir) Change-Id: Iff384eb527327bf88543408e0257241c1fd99a43 Signed-off-by: Amit Pundir --- arch/arm/include/asm/mach/mmc.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/include/asm/mach/mmc.h b/arch/arm/include/asm/mach/mmc.h index bca864ac945f..f8d391ad9203 100644 --- a/arch/arm/include/asm/mach/mmc.h +++ b/arch/arm/include/asm/mach/mmc.h @@ -18,7 +18,6 @@ struct embedded_sdio_data { struct mmc_platform_data { unsigned int ocr_mask; /* available voltages */ int built_in; /* built-in device flag */ - int card_present; /* card detect state */ u32 (*translate_vdd)(struct device *, unsigned int); unsigned int (*status)(struct device *); struct embedded_sdio_data *embedded_sdio; -- cgit v1.2.3 From 96515037c151b35a09a10544bd82099fcab8af9d Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 4 May 2016 11:14:16 +0530 Subject: Revert "Recreate asm/mach/mmc.h include file" This reverts commit 5b42ae3edab6c39c1337d36881d29350bb36dcff. This recereated arch/arm/include/asm/mach/mmc.h include file has no active user in android-4.x kernels. Also all the necessary bits are already moved to include/linux/amba/mmci.h. 6ef297f86b62 (ARM: 5720/1: Move MMCI header to amba include dir) Change-Id: Ibf258b355d17f54f49b777a8f6e0089e9b59a3a5 Signed-off-by: Amit Pundir --- arch/arm/include/asm/mach/mmc.h | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 arch/arm/include/asm/mach/mmc.h (limited to 'arch') diff --git a/arch/arm/include/asm/mach/mmc.h b/arch/arm/include/asm/mach/mmc.h deleted file mode 100644 index f8d391ad9203..000000000000 --- a/arch/arm/include/asm/mach/mmc.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * arch/arm/include/asm/mach/mmc.h - */ -#ifndef ASMARM_MACH_MMC_H -#define ASMARM_MACH_MMC_H - -#include -#include -#include - -struct embedded_sdio_data { - struct sdio_cis cis; - struct sdio_cccr cccr; - struct sdio_embedded_func *funcs; - int num_funcs; -}; - -struct mmc_platform_data { - unsigned int ocr_mask; /* available voltages */ - int built_in; /* built-in device flag */ - u32 (*translate_vdd)(struct device *, unsigned int); - unsigned int (*status)(struct device *); - struct embedded_sdio_data *embedded_sdio; - int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id); -}; - -#endif -- cgit v1.2.3