From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:50175 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757282AbcLPBYD (ORCPT ); Thu, 15 Dec 2016 20:24:03 -0500 From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Pawel Osciak , Marek Szyprowski , Kyungmin Park , Hans Verkuil , Sumit Semwal , Rob Clark , Daniel Vetter , Laura Abbott , Sakari Ailus Subject: [RFC v2 08/11] vb2: dma-contig: Don't warn on failure in obtaining scatterlist Date: Fri, 16 Dec 2016 03:24:22 +0200 Message-Id: <20161216012425.11179-9-laurent.pinchart+renesas@ideasonboard.com> In-Reply-To: <20161216012425.11179-1-laurent.pinchart+renesas@ideasonboard.com> References: <20161216012425.11179-1-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-media-owner@vger.kernel.org List-ID: From: Sakari Ailus vb2_dc_get_base_sgt() which obtains the scatterlist already prints information on why the scatterlist could not be obtained. Also, remove the useless warning of a failed kmalloc(). Signed-off-by: Sakari Ailus Reviewed-by: Laurent Pinchart --- drivers/media/v4l2-core/videobuf2-dma-contig.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c index 2a00d12ffee2..d59f107f0457 100644 --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c @@ -370,10 +370,8 @@ static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf) struct sg_table *sgt; sgt = kmalloc(sizeof(*sgt), GFP_KERNEL); - if (!sgt) { - dev_err(buf->dev, "failed to alloc sg table\n"); + if (!sgt) return NULL; - } ret = dma_get_sgtable_attrs(buf->dev, sgt, buf->cookie, buf->dma_addr, buf->size, buf->attrs); @@ -400,7 +398,7 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, unsigned long flags) if (!buf->dma_sgt) buf->dma_sgt = vb2_dc_get_base_sgt(buf); - if (WARN_ON(!buf->dma_sgt)) + if (!buf->dma_sgt) return NULL; dbuf = dma_buf_export(&exp_info); -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [RFC v2 08/11] vb2: dma-contig: Don't warn on failure in obtaining scatterlist Date: Fri, 16 Dec 2016 03:24:22 +0200 Message-ID: <20161216012425.11179-9-laurent.pinchart+renesas@ideasonboard.com> References: <20161216012425.11179-1-laurent.pinchart+renesas@ideasonboard.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F44B6EAE1 for ; Fri, 16 Dec 2016 01:24:01 +0000 (UTC) In-Reply-To: <20161216012425.11179-1-laurent.pinchart+renesas@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-media@vger.kernel.org Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, Hans Verkuil , Kyungmin Park , Sakari Ailus , Pawel Osciak , Marek Szyprowski List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2FrYXJpIEFpbHVzIDxzYWthcmkuYWlsdXNAbGludXguaW50ZWwuY29tPgoKdmIyX2Rj X2dldF9iYXNlX3NndCgpIHdoaWNoIG9idGFpbnMgdGhlIHNjYXR0ZXJsaXN0IGFscmVhZHkgcHJp bnRzCmluZm9ybWF0aW9uIG9uIHdoeSB0aGUgc2NhdHRlcmxpc3QgY291bGQgbm90IGJlIG9idGFp bmVkLgoKQWxzbywgcmVtb3ZlIHRoZSB1c2VsZXNzIHdhcm5pbmcgb2YgYSBmYWlsZWQga21hbGxv YygpLgoKU2lnbmVkLW9mZi1ieTogU2FrYXJpIEFpbHVzIDxzYWthcmkuYWlsdXNAbGludXguaW50 ZWwuY29tPgpSZXZpZXdlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBp ZGVhc29uYm9hcmQuY29tPgotLS0KIGRyaXZlcnMvbWVkaWEvdjRsMi1jb3JlL3ZpZGVvYnVmMi1k bWEtY29udGlnLmMgfCA2ICsrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwg NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL21lZGlhL3Y0bDItY29yZS92aWRl b2J1ZjItZG1hLWNvbnRpZy5jIGIvZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRt YS1jb250aWcuYwppbmRleCAyYTAwZDEyZmZlZTIuLmQ1OWYxMDdmMDQ1NyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9tZWRpYS92NGwyLWNvcmUvdmlkZW9idWYyLWRtYS1jb250aWcuYworKysgYi9kcml2 ZXJzL21lZGlhL3Y0bDItY29yZS92aWRlb2J1ZjItZG1hLWNvbnRpZy5jCkBAIC0zNzAsMTAgKzM3 MCw4IEBAIHN0YXRpYyBzdHJ1Y3Qgc2dfdGFibGUgKnZiMl9kY19nZXRfYmFzZV9zZ3Qoc3RydWN0 IHZiMl9kY19idWYgKmJ1ZikKIAlzdHJ1Y3Qgc2dfdGFibGUgKnNndDsKIAogCXNndCA9IGttYWxs b2Moc2l6ZW9mKCpzZ3QpLCBHRlBfS0VSTkVMKTsKLQlpZiAoIXNndCkgewotCQlkZXZfZXJyKGJ1 Zi0+ZGV2LCAiZmFpbGVkIHRvIGFsbG9jIHNnIHRhYmxlXG4iKTsKKwlpZiAoIXNndCkKIAkJcmV0 dXJuIE5VTEw7Ci0JfQogCiAJcmV0ID0gZG1hX2dldF9zZ3RhYmxlX2F0dHJzKGJ1Zi0+ZGV2LCBz Z3QsIGJ1Zi0+Y29va2llLCBidWYtPmRtYV9hZGRyLAogCQlidWYtPnNpemUsIGJ1Zi0+YXR0cnMp OwpAQCAtNDAwLDcgKzM5OCw3IEBAIHN0YXRpYyBzdHJ1Y3QgZG1hX2J1ZiAqdmIyX2RjX2dldF9k bWFidWYodm9pZCAqYnVmX3ByaXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiAJaWYgKCFidWYtPmRt YV9zZ3QpCiAJCWJ1Zi0+ZG1hX3NndCA9IHZiMl9kY19nZXRfYmFzZV9zZ3QoYnVmKTsKIAotCWlm IChXQVJOX09OKCFidWYtPmRtYV9zZ3QpKQorCWlmICghYnVmLT5kbWFfc2d0KQogCQlyZXR1cm4g TlVMTDsKIAogCWRidWYgPSBkbWFfYnVmX2V4cG9ydCgmZXhwX2luZm8pOwotLSAKUmVnYXJkcywK CkxhdXJlbnQgUGluY2hhcnQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=