From e09b1d3ea82cda73dd660cae56036d92f4641ccb Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 30 Jul 2011 22:53:05 +0800 Subject: [PATCH] Revert "trout: Add functions for WiFi" This reverts commit 8c542b3a4e7855926d7b9f533492eede643ff0ff. --- drivers/mmc/core/sdio_io.c | 33 --------------------------------- include/linux/mmc/sdio_func.h | 2 -- 2 files changed, 35 deletions(-) mode change 100755 => 100644 drivers/mmc/core/sdio_io.c mode change 100755 => 100644 include/linux/mmc/sdio_func.h diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c old mode 100755 new mode 100644 index 6c1d8474ce7d..866528390f25 --- a/drivers/mmc/core/sdio_io.c +++ b/drivers/mmc/core/sdio_io.c @@ -382,39 +382,6 @@ u8 sdio_readb(struct sdio_func *func, unsigned int addr, int *err_ret) } EXPORT_SYMBOL_GPL(sdio_readb); -/** - * sdio_readb_ext - read a single byte from a SDIO function - * @func: SDIO function to access - * @addr: address to read - * @err_ret: optional status value from transfer - * @in: value to add to argument - * - * Reads a single byte from the address space of a given SDIO - * function. If there is a problem reading the address, 0xff - * is returned and @err_ret will contain the error code. - */ -unsigned char sdio_readb_ext(struct sdio_func *func, unsigned int addr, - int *err_ret, unsigned in) -{ - int ret; - unsigned char val; - - BUG_ON(!func); - - if (err_ret) - *err_ret = 0; - - ret = mmc_io_rw_direct(func->card, 0, func->num, addr, (u8)in, &val); - if (ret) { - if (err_ret) - *err_ret = ret; - return 0xFF; - } - - return val; -} -EXPORT_SYMBOL_GPL(sdio_readb_ext); - /** * sdio_writeb - write a single byte to a SDIO function * @func: SDIO function to access diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h old mode 100755 new mode 100644 index 1ebd07e756e1..4121c20cbe74 --- a/include/linux/mmc/sdio_func.h +++ b/include/linux/mmc/sdio_func.h @@ -136,8 +136,6 @@ extern int sdio_release_irq(struct sdio_func *func); extern unsigned int sdio_align_size(struct sdio_func *func, unsigned int sz); extern u8 sdio_readb(struct sdio_func *func, unsigned int addr, int *err_ret); -extern u8 sdio_readb_ext(struct sdio_func *func, unsigned int addr, int *err_ret, - unsigned in); extern u16 sdio_readw(struct sdio_func *func, unsigned int addr, int *err_ret); extern u32 sdio_readl(struct sdio_func *func, unsigned int addr, int *err_ret); -- 2.34.1