projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'lsm-pr-20220801' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm
[platform/kernel/linux-starfive.git]
/
drivers
/
mmc
/
core
/
queue.c
diff --git
a/drivers/mmc/core/queue.c
b/drivers/mmc/core/queue.c
index
f824cfd
..
fefaa90
100644
(file)
--- a/
drivers/mmc/core/queue.c
+++ b/
drivers/mmc/core/queue.c
@@
-116,8
+116,7
@@
static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req)
}
}
-static enum blk_eh_timer_return mmc_mq_timed_out(struct request *req,
- bool reserved)
+static enum blk_eh_timer_return mmc_mq_timed_out(struct request *req)
{
struct request_queue *q = req->q;
struct mmc_queue *mq = q->queuedata;