From patchwork Mon Feb 3 12:29:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 21917 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1WAIfL-0005Bv-0n; Mon, 03 Feb 2014 13:30:19 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1WAIfI-0008U7-9Z; Mon, 03 Feb 2014 13:30:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751204AbaBCMaL (ORCPT + 1 other); Mon, 3 Feb 2014 07:30:11 -0500 Received: from mail-pb0-f50.google.com ([209.85.160.50]:60806 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751037AbaBCMaJ (ORCPT ); Mon, 3 Feb 2014 07:30:09 -0500 Received: by mail-pb0-f50.google.com with SMTP id rq2so6982370pbb.23 for ; Mon, 03 Feb 2014 04:30:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BlB922n34NAC10SbIobq5a8iMzIklZvpnDIgxopuKHY=; b=FoxlWajf08i9oJGuU/3xCERYDF1rtVUprSCJUv8tP7DK8xFORQnxA32hNEW2KVDbD7 JwRe8jZjhhOsIda9ubGtbUZn/ky1KROrzcpY2YoJOJgmd0hnbaNJlXylIk1y40koxMi9 BsQfPD0OuPu7errQw8IzTDRTza3djoKpzLhUf8UqJwQIybmTamrgX7eCtq1xp/MdQv6U C2ccuqZ/ePiH3XRIfMD4vddSrYaERmM3T1X1NFNi1WlHGRMPE8ajVdwDkJUt0y2eIeav Eaff5T/QCDIA1da2FifVDc3IcyOCNWHhEyLLeeBna98MemT/pbjxrbDUCIl4nsTOOH7C 4hmg== X-Gm-Message-State: ALoCoQmRt50Vs03f+1HGxzel5h0OCnVeulP5NKmGtl6jPZfAcAZW7pHPBGPeCDn7GiAynlw0FOOD X-Received: by 10.67.22.38 with SMTP id hp6mr37105725pad.53.1391430609020; Mon, 03 Feb 2014 04:30:09 -0800 (PST) Received: from localhost.localdomain ([122.179.40.212]) by mx.google.com with ESMTPSA id db3sm55650937pbb.10.2014.02.03.04.30.05 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Feb 2014 04:30:08 -0800 (PST) From: Sumit Semwal To: linux@arm.linux.org.uk Cc: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, patches@linaro.org, linaro-kernel@lists.linaro.org, Sumit Semwal Subject: [PATCH] dma-buf: update debugfs output Date: Mon, 3 Feb 2014 17:59:41 +0530 Message-Id: <1391430581-18522-1-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 1.8.3.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.2.3.121816 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Russell King observed 'wierd' looking output from debugfs, and also suggested better ways of getting device names (use KBUILD_MODNAME, dev_name()) This patch addresses these issues to make the debugfs output correct and better looking. Signed-off-by: Sumit Semwal --- drivers/base/dma-buf.c | 18 ++++++++---------- include/linux/dma-buf.h | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index cfe1d8b..bf89fe3 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c @@ -621,7 +621,7 @@ static int dma_buf_describe(struct seq_file *s) return ret; seq_printf(s, "\nDma-buf Objects:\n"); - seq_printf(s, "\texp_name\tsize\tflags\tmode\tcount\n"); + seq_printf(s, "size\tflags\tmode\tcount\texp_name\n"); list_for_each_entry(buf_obj, &db_list.head, list_node) { ret = mutex_lock_interruptible(&buf_obj->lock); @@ -632,24 +632,22 @@ static int dma_buf_describe(struct seq_file *s) continue; } - seq_printf(s, "\t"); - - seq_printf(s, "\t%s\t%08zu\t%08x\t%08x\t%08ld\n", - buf_obj->exp_name, buf_obj->size, + seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\n", + buf_obj->size, buf_obj->file->f_flags, buf_obj->file->f_mode, - (long)(buf_obj->file->f_count.counter)); + (long)(buf_obj->file->f_count.counter), buf_obj->exp_name); - seq_printf(s, "\t\tAttached Devices:\n"); + seq_printf(s, "\tAttached Devices:\n"); attach_count = 0; list_for_each_entry(attach_obj, &buf_obj->attachments, node) { - seq_printf(s, "\t\t"); + seq_printf(s, "\t"); - seq_printf(s, "%s\n", attach_obj->dev->init_name); + seq_printf(s, "%s\n", dev_name(attach_obj->dev)); attach_count++; } - seq_printf(s, "\n\t\tTotal %d devices attached\n", + seq_printf(s, "\nTotal %d devices attached\n", attach_count); count++; diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index dfac5ed..f886985 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -171,7 +171,7 @@ struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops, size_t size, int flags, const char *); #define dma_buf_export(priv, ops, size, flags) \ - dma_buf_export_named(priv, ops, size, flags, __FILE__) + dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME) int dma_buf_fd(struct dma_buf *dmabuf, int flags); struct dma_buf *dma_buf_get(int fd);