Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / drivers / block / mtip32xx / mtip32xx.c

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 6053e46..2aca98e 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3765,7 +3765,7 @@ static int mtip_submit_request(struct blk_mq_hw_ctx *hctx, struct request *rq)
                        return -ENODATA;
        }
 
-       if (rq->cmd_flags & REQ_DISCARD) {
+       if (req_op(rq) == REQ_OP_DISCARD) {
                int err;
 
                err = mtip_send_trim(dd, blk_rq_pos(rq), blk_rq_sectors(rq));
@@ -3956,7 +3956,6 @@ static int mtip_block_initialize(struct driver_data *dd)
        if (rv)
                goto disk_index_error;
 
-       dd->disk->driverfs_dev  = &dd->pdev->dev;
        dd->disk->major         = dd->major;
        dd->disk->first_minor   = index * MTIP_MAX_MINORS;
        dd->disk->minors        = MTIP_MAX_MINORS;
@@ -4008,7 +4007,7 @@ skip_create_disk:
 
        /*
         * if rebuild pending, start the service thread, and delay the block
-        * queue creation and add_disk()
+        * queue creation and device_add_disk()
         */
        if (wait_for_rebuild == MTIP_FTL_REBUILD_MAGIC)
                goto start_service_thread;
@@ -4042,7 +4041,7 @@ skip_create_disk:
        set_capacity(dd->disk, capacity);
 
        /* Enable the block device and add it to /dev */
-       add_disk(dd->disk);
+       device_add_disk(&dd->pdev->dev, dd->disk);
 
        dd->bdev = bdget_disk(dd->disk, 0);
        /*