From patchwork Thu Jul 20 20:19:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 108453 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2577046qge; Thu, 20 Jul 2017 13:19:33 -0700 (PDT) X-Received: by 10.84.171.197 with SMTP id l63mr5456240plb.167.1500581973152; Thu, 20 Jul 2017 13:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500581973; cv=none; d=google.com; s=arc-20160816; b=DQp0uZHgGTXGqa6vPvKrIWeztk0kvPU5QUvbuMlaSG/lJHCmuu0wQpOtMmsFEliEiV U5N7++IEqV5/wjNnMAS6I8yhsmM9j6ilCClh4s7qrTrYZIkXTvk/KB78D4E1D+AbSxt8 z8PRZwjMlU7OwUnLcw9xyDtIx+UGSwavWNkacYtZGmpkSYOGyM4tRlP44qvevrYQTGDI gY8Ib/gi0A46uiWShd2XCsmdi1V8g0Atjtom4gr6R9/ShSMQWCbAtzB3Ax77mpcdEcXK qn1N+Jp+6QrAXfygz/HK7/X2vzFwhIaFDFxhqU99+mSqUf6O/7ssW7bDaPMDVBxBsI/z BCtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=e8jFpwW4Lt61sLqXSsv6lux9GSFwP9YB7rLOcuQAQls=; b=WiLVsD3sXanLidKu+6qMv9+pC10wBntkAMKI2Qu6ZK/rZMl3Rrjyq20aBxTsDcVsDQ xewZjfRr497bsDhH5diC+lFXUnRLd3YpbC/4LsM2XeUIJIV07v040fXYm3T3Jfx9WF52 ND+Asz7NViJaCcpZNliKsURrmu4g0NDY8O8w5gOBmgbpnQM4LM1Jd4+4lGHD3T6fOfE1 YaCYX8g9/WMBlmbbLGFsyYc24lIfT1ADbtOqx7LCkZXyUfIog8QbZ3j4VQuRLDJ64LyV 6BYwXgTGovuHX77NrNYcmLNgmJukYNOm1vUMoHp/uLms8vXjaQt05LVYBFAk8KYSKGn6 Quog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.b=RNfu06ms; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x12si2042039plm.396.2017.07.20.13.19.31; Thu, 20 Jul 2017 13:19:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.b=RNfu06ms; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935258AbdGTUT3 (ORCPT + 25 others); Thu, 20 Jul 2017 16:19:29 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:57790 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933712AbdGTUT1 (ORCPT ); Thu, 20 Jul 2017 16:19:27 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v6KKJQQ4004175; Thu, 20 Jul 2017 15:19:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1500581966; bh=tknG4BSctVxubKIPPZPickhUj3M26nasWEoH8uatVxI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=RNfu06msY6XKF8XCXQgNwq6hn04KBmXoPpVT0aLrIfKi/1lqLf9hD64Zpod9rebYq sXTVOkMknfALJaQc87IOVeR5evRR9qrwpZXfBctn+46sfec81dvNuzxmRT2YIOnSM6 hNEy3DqsIpIiujpHzHoPX8RtmlsWNfHEEc3MgJkA= Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v6KKJPFG010692; Thu, 20 Jul 2017 15:19:25 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Thu, 20 Jul 2017 15:19:25 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v6KKJPwE026286; Thu, 20 Jul 2017 15:19:25 -0500 Received: from localhost (irmo.dhcp.ti.com [128.247.58.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id v6KKJP320633; Thu, 20 Jul 2017 15:19:25 -0500 (CDT) From: Suman Anna To: Bjorn Andersson , Ohad Ben-Cohen CC: , , Suman Anna Subject: [PATCH v2] remoteproc: Merge __rproc_boot() with rproc_boot() Date: Thu, 20 Jul 2017 15:19:22 -0500 Message-ID: <20170720201922.19575-1-s-anna@ti.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170720020628.10917-1-s-anna@ti.com> References: <20170720020628.10917-1-s-anna@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The additional arguments in the internal __rproc_boot() function were dropped in commit 2bfc311a57f5 ("remoteproc: Drop wait in __rproc_boot()"). The exported rproc_boot() is now just a wrapper around this internal function, so merge them together. While at this, also remove the declaration for the previously cleaned up rproc_boot_nowait() function. Signed-off-by: Suman Anna --- v2: - Fixed the missed out function name change in comments - Drop rproc_boot_nowait() from internal header as well drivers/remoteproc/remoteproc_core.c | 13 ++----------- drivers/remoteproc/remoteproc_internal.h | 1 - 2 files changed, 2 insertions(+), 12 deletions(-) -- 2.13.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 564061dcc019..364ef28bac84 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1119,7 +1119,7 @@ static void rproc_crash_handler_work(struct work_struct *work) } /** - * __rproc_boot() - boot a remote processor + * rproc_boot() - boot a remote processor * @rproc: handle of a remote processor * * Boot a remote processor (i.e. load its firmware, power it on, ...). @@ -1129,7 +1129,7 @@ static void rproc_crash_handler_work(struct work_struct *work) * * Returns 0 on success, and an appropriate error value otherwise. */ -static int __rproc_boot(struct rproc *rproc) +int rproc_boot(struct rproc *rproc) { const struct firmware *firmware_p; struct device *dev; @@ -1180,15 +1180,6 @@ static int __rproc_boot(struct rproc *rproc) mutex_unlock(&rproc->lock); return ret; } - -/** - * rproc_boot() - boot a remote processor - * @rproc: handle of a remote processor - */ -int rproc_boot(struct rproc *rproc) -{ - return __rproc_boot(rproc); -} EXPORT_SYMBOL(rproc_boot); /** diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h index 1e9e5b3f021c..c1077bec5d0b 100644 --- a/drivers/remoteproc/remoteproc_internal.h +++ b/drivers/remoteproc/remoteproc_internal.h @@ -48,7 +48,6 @@ struct rproc_fw_ops { /* from remoteproc_core.c */ void rproc_release(struct kref *kref); irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id); -int rproc_boot_nowait(struct rproc *rproc); void rproc_vdev_release(struct kref *ref); /* from remoteproc_virtio.c */