From 7028f519dcb6f78c828ff43e4e7775e4f1f48a8f Mon Sep 17 00:00:00 2001 From: "K. Cotulla Ivan" Date: Sun, 5 Sep 2010 11:11:46 +0200 Subject: [PATCH] htcleo: removed microp sd card support --- arch/arm/mach-msm/board-htcleo-microp.c | 41 +------------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/arch/arm/mach-msm/board-htcleo-microp.c b/arch/arm/mach-msm/board-htcleo-microp.c index f06f4a55..7a3584ee 100644 --- a/arch/arm/mach-msm/board-htcleo-microp.c +++ b/arch/arm/mach-msm/board-htcleo-microp.c @@ -64,9 +64,7 @@ static char *hex2string(uint8_t *data, int len) return buf; } -#define I2C_READ_RETRY_TIMES 10/* - * SD slot card-detect support - */ +#define I2C_READ_RETRY_TIMES 10 #define I2C_WRITE_RETRY_TIMES 10 static int i2c_read_block(struct i2c_client *client, uint8_t addr, @@ -354,36 +352,6 @@ int microp_gpo_disable(uint16_t interrupt_mask) EXPORT_SYMBOL(microp_gpo_disable); -/* - * SD slot card-detect support - */ -static unsigned int sdslot_cd = 0; -static void (*sdslot_status_cb)(int card_present, void *dev_id); -static void *sdslot_mmc_dev; - -int htcleo_microp_sdslot_status_register( - void (*cb)(int card_present, void *dev_id), - void *dev_id) -{ - if (sdslot_status_cb) - return -EBUSY; - sdslot_status_cb = cb; - sdslot_mmc_dev = dev_id; - return 0; -} - -unsigned int htcleo_microp_sdslot_status(struct device *dev) -{ - return sdslot_cd; -} - -static void htcleo_microp_sdslot_update_status(int status) -{ - sdslot_cd = !(status & READ_GPI_STATE_SDCARD); - if (sdslot_status_cb) - sdslot_status_cb(sdslot_cd, sdslot_mmc_dev); -} - /* * Interrupt */ @@ -429,10 +397,6 @@ static void microp_i2c_intr_work_func(struct work_struct *work) } pr_debug("intr_status=0x%02x\n", intr_status); - if (intr_status & IRQ_SDCARD) { - microp_read_gpi_status(client, &gpi_status); - htcleo_microp_sdslot_update_status(gpi_status); - } if (intr_status & IRQ_PROXIMITY) { p_sensor_irq_handler(); } @@ -449,8 +413,6 @@ static int microp_function_initialize(struct i2c_client *client) cdata = i2c_get_clientdata(client); - /* SD Card */ - interrupts |= IRQ_SDCARD; interrupts |= IRQ_PROXIMITY; /* enable the interrupts */ @@ -462,7 +424,6 @@ static int microp_function_initialize(struct i2c_client *client) } microp_read_gpi_status(client, &stat); - htcleo_microp_sdslot_update_status(stat); return 0;