Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

+29

MAINTAINERS

··· 332 332 W: http://www.linux-usb.org/SpeedTouch/ 333 333 S: Maintained 334 334 335 + ALCHEMY AU1XX0 MMC DRIVER 336 + S: Orphan 337 + 335 338 ALI1563 I2C DRIVER 336 339 P: Rudolf Marek 337 340 M: r.marek@assembler.cz ··· 419 416 ARM MFM AND FLOPPY DRIVERS 420 417 P: Ian Molton 421 418 M: spyro@f2s.com 419 + S: Maintained 420 + 421 + ARM PRIMECELL MMCI PL180/1 DRIVER 422 + P: Russell King 423 + M: rmk@arm.linux.org.uk 424 + L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 422 425 S: Maintained 423 426 424 427 ARM/ADI ROADRUNNER MACHINE SUPPORT ··· 657 648 L: linux-atm-general@lists.sourceforge.net (subscribers-only) 658 649 W: http://linux-atm.sourceforge.net 659 650 S: Maintained 651 + 652 + ATMEL AT91 MCI DRIVER 653 + S: Orphan 660 654 661 655 ATMEL MACB ETHERNET DRIVER 662 656 P: Haavard Skinnemoen ··· 2392 2380 W: http://popies.net/meye/ 2393 2381 S: Maintained 2394 2382 2383 + MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER 2384 + P: Pavel Pisa 2385 + M: ppisa@pikron.com 2386 + L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 2387 + W: http://mmc.drzeus.cx/wiki/Controllers/Freescale/SDHC 2388 + S: Maintained 2389 + 2395 2390 MOUSE AND MISC DEVICES [GENERAL] 2396 2391 P: Alessandro Rubini 2397 2392 M: rubini@ipvvis.unipv.it ··· 2919 2900 L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 2920 2901 S: Maintained 2921 2902 2903 + PXA MMCI DRIVER 2904 + S: Orphan 2905 + 2922 2906 QLOGIC QLA2XXX FC-SCSI DRIVER 2923 2907 P: Andrew Vasquez 2924 2908 M: linux-driver@qlogic.com ··· 3437 3415 P: Alex Dubov 3438 3416 M: oakad@yahoo.com 3439 3417 S: Maintained 3418 + 3419 + TI OMAP MMC INTERFACE DRIVER 3420 + P: Carlos Aguiar, Anderson Briglia and Syed Khasim 3421 + M: linux-omap-open-source@linux.omap.com 3422 + W: http://linux.omap.com 3423 + W: http://www.muru.com/linux/omap/ 3424 + S: Maintained 3440 3425 3441 3426 TI OMAP RANDOM NUMBER GENERATOR SUPPORT 3442 3427 P: Deepak Saxena

-18

drivers/mmc/card/block.c

··· 135 135 struct mmc_data data; 136 136 }; 137 137 138 - static int mmc_blk_prep_rq(struct mmc_queue *mq, struct request *req) 139 - { 140 - struct mmc_blk_data *md = mq->data; 141 - int stat = BLKPREP_OK; 142 - 143 - /* 144 - * If we have no device, we haven't finished initialising. 145 - */ 146 - if (!md || !mq->card) { 147 - printk(KERN_ERR "%s: killing request - no device/host\n", 148 - req->rq_disk->disk_name); 149 - stat = BLKPREP_KILL; 150 - } 151 - 152 - return stat; 153 - } 154 - 155 138 static u32 mmc_sd_num_wr_blocks(struct mmc_card *card) 156 139 { 157 140 int err; ··· 443 460 if (ret) 444 461 goto err_putdisk; 445 462 446 - md->queue.prep_fn = mmc_blk_prep_rq; 447 463 md->queue.issue_fn = mmc_blk_issue_rq; 448 464 md->queue.data = md; 449 465

+8 -27

drivers/mmc/card/queue.c

··· 20 20 #define MMC_QUEUE_SUSPENDED (1 << 0) 21 21 22 22 /* 23 - * Prepare a MMC request. Essentially, this means passing the 24 - * preparation off to the media driver. The media driver will 25 - * create a mmc_io_request in req->special. 23 + * Prepare a MMC request. This just filters out odd stuff. 26 24 */ 27 25 static int mmc_prep_request(struct request_queue *q, struct request *req) 28 26 { 29 - struct mmc_queue *mq = q->queuedata; 30 - int ret = BLKPREP_KILL; 31 - 32 - if (blk_special_request(req)) { 33 - /* 34 - * Special commands already have the command 35 - * blocks already setup in req->special. 36 - */ 37 - BUG_ON(!req->special); 38 - 39 - ret = BLKPREP_OK; 40 - } else if (blk_fs_request(req) || blk_pc_request(req)) { 41 - /* 42 - * Block I/O requests need translating according 43 - * to the protocol. 44 - */ 45 - ret = mq->prep_fn(mq, req); 46 - } else { 47 - /* 48 - * Everything else is invalid. 49 - */ 27 + /* 28 + * We only like normal block requests. 29 + */ 30 + if (!blk_fs_request(req) && !blk_pc_request(req)) { 50 31 blk_dump_rq_flags(req, "MMC bad request"); 32 + return BLKPREP_KILL; 51 33 } 52 34 53 - if (ret == BLKPREP_OK) 54 - req->cmd_flags |= REQ_DONTPREP; 35 + req->cmd_flags |= REQ_DONTPREP; 55 36 56 - return ret; 37 + return BLKPREP_OK; 57 38 } 58 39 59 40 static int mmc_queue_thread(void *d)

-8

drivers/mmc/card/queue.h

··· 10 10 struct semaphore thread_sem; 11 11 unsigned int flags; 12 12 struct request *req; 13 - int (*prep_fn)(struct mmc_queue *, struct request *); 14 13 int (*issue_fn)(struct mmc_queue *, struct request *); 15 14 void *data; 16 15 struct request_queue *queue; 17 16 struct scatterlist *sg; 18 - }; 19 - 20 - struct mmc_io_request { 21 - struct request *rq; 22 - int num; 23 - struct mmc_command selcmd; /* mmc_queue private */ 24 - struct mmc_command cmd[4]; /* max 4 commands */ 25 17 }; 26 18 27 19 extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *);

Configure Feed

Configure Feed