xen/blkback: Fix warning error.

drivers/block/xen-blkback/xenbus.c: In function 'xen_blkbk_discard':
drivers/block/xen-blkback/xenbus.c:419:4: warning: passing argument 1 of 'dev_warn' makes pointer from integer without a cast
+[enabled by default]
include/linux/device.h:894:5: note: expected 'const struct device *' but argument is of type 'long int'

It is unclear how that mistake made it in. It surely is wrong.

[upstream git commit a71e23d]
Acked-by: Jens Axboe <axboe@kernel.dk>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Conflicts:

	drivers/block/xen-blkback/xenbus.c

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 6c8dde8ce31674167e53546e6c0e06eb8de9afbe..a61faf7612399aa72594616765818f8836b449ba 100644 (file)
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -426,7 +426,7 @@ static void xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info
                                "discard-secure", "%d",
                                blkif->vbd.discard_secure);
                        if (err) {
-                               dev_warn(dev-dev, "writing discard-secure (%d)", err);
+                               dev_warn(&dev->dev, "writing discard-secure (%d)", err);
                                goto kfree;
                        }
                }