Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin

Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Andreas Fenkart and committed by
Ulf Hansson
e03de745 11227d12

-13
-13
drivers/mmc/host/omap_hsmmc.c
··· 418 418 419 419 #endif 420 420 421 - static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id); 422 421 static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id); 423 422 424 423 static int omap_hsmmc_gpio_init(struct mmc_host *mmc, ··· 439 440 return ret; 440 441 441 442 host->card_detect = omap_hsmmc_card_detect; 442 - mmc_gpio_set_cd_isr(mmc, omap_hsmmc_detect); 443 443 } 444 444 445 445 if (gpio_is_valid(pdata->gpio_wp)) { ··· 1243 1245 sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch"); 1244 1246 1245 1247 omap_hsmmc_protect_card(host); 1246 - mmc_detect_change(host->mmc, (HZ * 200) / 1000); 1247 - return IRQ_HANDLED; 1248 - } 1249 - 1250 - /* 1251 - * irq handler to notify the core about card insertion/removal 1252 - */ 1253 - static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id) 1254 - { 1255 - struct omap_hsmmc_host *host = dev_id; 1256 - 1257 1248 mmc_detect_change(host->mmc, (HZ * 200) / 1000); 1258 1249 return IRQ_HANDLED; 1259 1250 }