From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Tue, 07 Feb 2017 13:16:31 +0000 Subject: [patch] drm/i915/gvt/kvmgt: remove some dead code Message-Id: <20170207131630.GA28207@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Zhenyu Wang , Jike Song Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , intel-gvt-dev@lists.freedesktop.org, Zhi Wang If "caps.buf" is already NULL then it doesn't need to be freed or set to NULL. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index 3f656e3a6e5a..de2a55178a37 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -965,11 +965,8 @@ static long intel_vgpu_ioctl(struct mdev_device *mdev, unsigned int cmd, sparse->areas[0].offset PAGE_ALIGN(vgpu_aperture_offset(vgpu)); sparse->areas[0].size = vgpu_aperture_sz(vgpu); - if (!caps.buf) { - kfree(caps.buf); - caps.buf = NULL; + if (!caps.buf) caps.size = 0; - } break; case VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX: From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/i915/gvt/kvmgt: remove some dead code Date: Tue, 7 Feb 2017 16:16:31 +0300 Message-ID: <20170207131630.GA28207@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Zhenyu Wang , Jike Song Cc: intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , intel-gvt-dev@lists.freedesktop.org, Zhi Wang List-Id: dri-devel@lists.freedesktop.org SWYgImNhcHMuYnVmIiBpcyBhbHJlYWR5IE5VTEwgdGhlbiBpdCBkb2Vzbid0IG5lZWQgdG8gYmUg ZnJlZWQgb3Igc2V0IHRvCk5VTEwuCgpTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4u Y2FycGVudGVyQG9yYWNsZS5jb20+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3Z0L2t2bWd0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQva3ZtZ3QuYwppbmRleCAzZjY1 NmUzYTZlNWEuLmRlMmE1NTE3OGEzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv Z3Z0L2t2bWd0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2t2bWd0LmMKQEAgLTk2 NSwxMSArOTY1LDggQEAgc3RhdGljIGxvbmcgaW50ZWxfdmdwdV9pb2N0bChzdHJ1Y3QgbWRldl9k ZXZpY2UgKm1kZXYsIHVuc2lnbmVkIGludCBjbWQsCiAJCQlzcGFyc2UtPmFyZWFzWzBdLm9mZnNl dCA9CiAJCQkJCVBBR0VfQUxJR04odmdwdV9hcGVydHVyZV9vZmZzZXQodmdwdSkpOwogCQkJc3Bh cnNlLT5hcmVhc1swXS5zaXplID0gdmdwdV9hcGVydHVyZV9zeih2Z3B1KTsKLQkJCWlmICghY2Fw cy5idWYpIHsKLQkJCQlrZnJlZShjYXBzLmJ1Zik7Ci0JCQkJY2Fwcy5idWYgPSBOVUxMOworCQkJ aWYgKCFjYXBzLmJ1ZikKIAkJCQljYXBzLnNpemUgPSAwOwotCQkJfQogCQkJYnJlYWs7CiAKIAkJ Y2FzZSBWRklPX1BDSV9CQVIzX1JFR0lPTl9JTkRFWCAuLi4gVkZJT19QQ0lfQkFSNV9SRUdJT05f SU5ERVg6Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=