| tifm_sd.c (e5451c8f8330e03ad3cfa16048b4daf961af434f) | tifm_sd.c (2ee4f6200597bda9713e28a9c1e65a392615b4b5) |
|---|---|
| 1/* 2 * tifm_sd.c - TI FlashMedia driver 3 * 4 * Copyright (C) 2006 Alex Dubov <oakad@yahoo.com> 5 * 6 * This program is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License version 2 as 8 * published by the Free Software Foundation. --- 769 unchanged lines hidden (view full) --- 778 779 writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL), 780 sock->addr + SOCK_CONTROL); 781 782 spin_unlock_irqrestore(&sock->lock, flags); 783 mmc_request_done(mmc, mrq); 784} 785 | 1/* 2 * tifm_sd.c - TI FlashMedia driver 3 * 4 * Copyright (C) 2006 Alex Dubov <oakad@yahoo.com> 5 * 6 * This program is free software; you can redistribute it and/or modify 7 * it under the terms of the GNU General Public License version 2 as 8 * published by the Free Software Foundation. --- 769 unchanged lines hidden (view full) --- 778 779 writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL), 780 sock->addr + SOCK_CONTROL); 781 782 spin_unlock_irqrestore(&sock->lock, flags); 783 mmc_request_done(mmc, mrq); 784} 785 |
| 786static void tifm_sd_abort(unsigned long data) | 786static void tifm_sd_abort(struct timer_list *t) |
| 787{ | 787{ |
| 788 struct tifm_sd *host = (struct tifm_sd*)data; | 788 struct tifm_sd *host = from_timer(host, t, timer); |
| 789 790 pr_err("%s : card failed to respond for a long period of time " 791 "(%x, %x)\n", 792 dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags); 793 794 tifm_eject(host->dev); 795} 796 --- 166 unchanged lines hidden (view full) --- 963 964 host = mmc_priv(mmc); 965 tifm_set_drvdata(sock, mmc); 966 host->dev = sock; 967 host->timeout_jiffies = msecs_to_jiffies(1000); 968 969 tasklet_init(&host->finish_tasklet, tifm_sd_end_cmd, 970 (unsigned long)host); | 789 790 pr_err("%s : card failed to respond for a long period of time " 791 "(%x, %x)\n", 792 dev_name(&host->dev->dev), host->req->cmd->opcode, host->cmd_flags); 793 794 tifm_eject(host->dev); 795} 796 --- 166 unchanged lines hidden (view full) --- 963 964 host = mmc_priv(mmc); 965 tifm_set_drvdata(sock, mmc); 966 host->dev = sock; 967 host->timeout_jiffies = msecs_to_jiffies(1000); 968 969 tasklet_init(&host->finish_tasklet, tifm_sd_end_cmd, 970 (unsigned long)host); |
| 971 setup_timer(&host->timer, tifm_sd_abort, (unsigned long)host); | 971 timer_setup(&host->timer, tifm_sd_abort, 0); |
| 972 973 mmc->ops = &tifm_sd_ops; 974 mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; 975 mmc->caps = MMC_CAP_4_BIT_DATA; 976 mmc->f_min = 20000000 / 60; 977 mmc->f_max = 24000000; 978 979 mmc->max_blk_count = 2048; --- 112 unchanged lines hidden --- | 972 973 mmc->ops = &tifm_sd_ops; 974 mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; 975 mmc->caps = MMC_CAP_4_BIT_DATA; 976 mmc->f_min = 20000000 / 60; 977 mmc->f_max = 24000000; 978 979 mmc->max_blk_count = 2048; --- 112 unchanged lines hidden --- |