aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-pm.c')
-rw-r--r--drivers/ide/ide-pm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index ad8a125defdd..59217aa1d1fb 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -19,7 +19,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
}
memset(&rqpm, 0, sizeof(rqpm));
- rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, __GFP_RECLAIM);
+ rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, 0);
ide_req(rq)->type = ATA_PRIV_PM_SUSPEND;
rq->special = &rqpm;
rqpm.pm_step = IDE_PM_START_SUSPEND;
@@ -90,8 +90,7 @@ int generic_ide_resume(struct device *dev)
}
memset(&rqpm, 0, sizeof(rqpm));
- rq = blk_get_request_flags(drive->queue, REQ_OP_DRV_IN,
- BLK_MQ_REQ_PREEMPT);
+ rq = blk_get_request(drive->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_PREEMPT);
ide_req(rq)->type = ATA_PRIV_PM_RESUME;
rq->special = &rqpm;
rqpm.pm_step = IDE_PM_START_RESUME;
ef='/linux/commit/drivers/gpio/gpio-loongson.c?id=991ff4e3d71dcad184d18f9b1b241f3191601909&follow=1'>MIPS: Move Loongson GPIO driver to drivers/gpioHuacai Chen5-1/+8 2015-04-07MIPS: Cleanup Loongson-2F's gpio driverHuacai Chen2-64/+31 2015-03-27gpio: gpio-tb10x: remove incorrect __exit markupDmitry Torokhov1-1/+1 2015-03-27gpio: omap: get rid of GPIO_INDEX() macroGrygorii Strashko1-9/+0 2015-03-27gpio: omap: get rid of omap_irq_to_gpio()Grygorii Strashko1-12/+5 2015-03-27gpio: omap: get rid of GPIO_BIT() macroGrygorii Strashko1-1/+0 2015-03-27gpio: omap: convert gpio irq functions to use GPIO offsetGrygorii Strashko1-33/+34 2015-03-27gpio: omap: drop 'gpio' param from omap_gpio_init_irq()Grygorii Strashko1-7/+5 2015-03-27gpio: omap: convert debounce functions switch to use gpio offsetGrygorii Strashko1-7/+7 2015-03-27gpio: omap: simplify omap_set_gpio_dataout_x()Grygorii Strashko1-5/+5 2015-03-27gpio: omap: convert omap_gpio_is_input() to use gpio offsetGrygorii Strashko1-6/+4 2015-03-27altera_gpio_probe() can be statickbuild test robot1-1/+1 2015-03-26gpio: rcar: Prevent module clock disable when wake-up is enabledGeert Uytterhoeven1-2/+31 2015-03-26gpio: rcar: Add more register documentationGeert Uytterhoeven1-12/+12 2015-03-26gpio: rcar: Use local variable gpio_chip in gpio_rcar_probe()Geert Uytterhoeven1-3/+3 2015-03-26gpio/crystalcove: Add additional GPIO for Panel controlShobhit Kumar1-1/+6 2015-03-19gpio: dwapb: enable for QuarkAndy Shevchenko1-2/+1 2015-03-19gpio / ACPI: Use local variable instead of ACPI_HANDLE()Rafael J. Wysocki1-1/+1 2015-03-19gpio / ACPI: Avoid unnecessary checks in __gpiod_get_index()Rafael J. Wysocki1-7/+9 2015-03-19gpio: move pincontrol calls to <linux/gpio/driver.h>Linus Walleij2-48/+48 2015-03-17gpio: f7188x: add GPIO support for F71869AAndreas Bofjall2-5/+25 2015-03-17gpio: f7188x: add GPIO support for F71869Andreas Bofjall2-5/+24 2015-03-17gpio: f7188x: correct spelling of "Fintek"Andreas Bofjall1-1/+1 2015-03-17gpio: fix constconst in devresLinus Walleij1-1/+1 2015-03-09gpio: omap: irq_shutdown: remove unnecessary call of gpiochip_unlock_as_irqGrygorii Strashko1-1/+0 2015-03-09extend documentation for gpiod_set_array() functionsRojhalat Ibrahim1-0/+20 2015-03-09gpio: mrvl: documentation: trivial: fix typoJosh Wu1-1/+1 2015-03-09gpio: pxa: simplify BANK_OFF macro offset calculationRob Herring1-2/+1 2015-03-09gpio: dwapb: re-enable GPIO_DWAPB for arm64Kefeng Wang1-1/+1