From patchwork Tue Aug 16 00:17:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9282405 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6848B600CB for ; Tue, 16 Aug 2016 00:20:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A6E521050 for ; Tue, 16 Aug 2016 00:20:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CE7B28E9E; Tue, 16 Aug 2016 00:20:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E35A328E8E for ; Tue, 16 Aug 2016 00:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127AbcHPAR2 (ORCPT ); Mon, 15 Aug 2016 20:17:28 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:32781 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752408AbcHPAR0 (ORCPT ); Mon, 15 Aug 2016 20:17:26 -0400 Received: by mail-pa0-f42.google.com with SMTP id ti13so20415428pac.0 for ; Mon, 15 Aug 2016 17:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LA3is9G5QyGXKSslNJpgG/rF0F/cNw3ol9eNFaoo+54=; b=DAVwXl+g+KVVoODWqGvovXbIJLSkR8xyvPoK3dbCt+EosuOyMnIkHPtO1fzW6g71/m OSYGOaXuZ1T24r25E2cnkGvpazTa3QoILhaNEHO1lFL5CT1MvFhNs0ePjRt2Z6ZnB3zr kXOfX5g9dhXRisBB543Lmmcs19Cl/2k+QE+aU= 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:in-reply-to :references; bh=LA3is9G5QyGXKSslNJpgG/rF0F/cNw3ol9eNFaoo+54=; b=EWIvFDhxY03xxKVUvReT9korX16sQY6r2Xnq6AKKVDqiFxGVJBeGGNcGmlY8jHeTzr vjE5JIyMkD+HzLOi92J2dUaY5XkMLZ3idgnjyP98/rjnzpc13SeW4OuwIH/60xiH3jff J6xMRoypEp/rXSGfM6NWPWSt2FNkcJTG0dJNtpP2cKXVQaX+g0zZRoLURe0KeKWt/KTR 4Zlu7rWzIFmSGUIgdkw/Xd73GLGxDuAhCkTWOAhDpuh0N5mR2L2CdzWsLJnJ+3LSqrQB hyEcdN8TAiwHhfHfImpwdaqD4ApRGqLLT5pSwXXEaDGsi2BjXynEjApkmoAKRTXge8Cr Zvug== X-Gm-Message-State: AEkoout+R7XTQQNsC8S47mAFe30yY33FQLvFwx7RGdELhiPyobOm/KUWCn/85+HqdlrNsemK X-Received: by 10.66.170.44 with SMTP id aj12mr58964645pac.131.1471306645636; Mon, 15 Aug 2016 17:17:25 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id p187sm34047931pfb.5.2016.08.15.17.17.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Aug 2016 17:17:25 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/14] rpmsg: Name rpmsg devices based on channel id Date: Mon, 15 Aug 2016 17:17:08 -0700 Message-Id: <1471306640-29917-3-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1471306640-29917-1-git-send-email-bjorn.andersson@linaro.org> References: <1471306640-29917-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By basing rpmsg device names on channel id we end up with human readable device names in sysfs and debug logs. Signed-off-by: Bjorn Andersson --- drivers/rpmsg/virtio_rpmsg_bus.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 495fa0a282d3..c4bd89ea7681 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -136,14 +136,6 @@ rpmsg_show_attr(src, src, "0x%x\n"); rpmsg_show_attr(dst, dst, "0x%x\n"); rpmsg_show_attr(announce, announce ? "true" : "false", "%s\n"); -/* - * Unique (and free running) index for rpmsg devices. - * - * Yeah, we're not recycling those numbers (yet?). will be easy - * to change if/when we want to. - */ -static unsigned int rpmsg_dev_index; - static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -531,8 +523,8 @@ static struct rpmsg_channel *rpmsg_create_channel(struct virtproc_info *vrp, strncpy(rpdev->id.name, chinfo->name, RPMSG_NAME_SIZE); - /* very simple device indexing plumbing which is enough for now */ - dev_set_name(&rpdev->dev, "rpmsg%d", rpmsg_dev_index++); + dev_set_name(&rpdev->dev, "%s:%s", + dev_name(dev->parent), rpdev->id.name); rpdev->dev.parent = &vrp->vdev->dev; rpdev->dev.bus = &rpmsg_bus;