From: Konrad Rzeszutek Wilk Date: Tue, 17 Apr 2012 01:55:04 +0000 (-0400) Subject: xen/blkback: Fix warning error. X-Git-Tag: v2.6.39-400.9.0~543^2~17^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ab06e32c690b2f179c9989a7db96a1861bc6a2cf;p=users%2Fjedix%2Flinux-maple.git 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 Reported-by: Stephen Rothwell Signed-off-by: Konrad Rzeszutek Wilk Conflicts: drivers/block/xen-blkback/xenbus.c --- diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c index 6c8dde8ce316..a61faf761239 100644 --- 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; } }