From patchwork Thu Jul 20 02:06:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 108316 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1531953qge; Wed, 19 Jul 2017 19:09:24 -0700 (PDT) X-Received: by 10.98.129.197 with SMTP id t188mr2099937pfd.318.1500516564026; Wed, 19 Jul 2017 19:09:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500516564; cv=none; d=google.com; s=arc-20160816; b=jzenBaSRAPdDn8kb0s/zHfLoXKIAxgD+Drwpa4np7WtqOGkk8oiJujRrC4b7yG68rL xINiwLWnLtzZy0nc0oDYzUH7SQKeEpbZ/RGGyxKHYp+jBf9q3RCoAU66zwF3QL42WDzw 482zMZghYBgl6Sbt40+vVUpgUgjjznLOPD0dWc3S7+hr3eEvyKenaKRVohuc8knJGH8Z ev/7xVLUvO49T1MKNdslzedN4cG/QJed2gs3lV1KfusXs5Y6gwVfs7MMdoln8XrrJqLe FLeg2xGlXeBMgFqsEBE9smlkSQNBDuMedEiF9xjCGX+YpfWEpe/EkQ86Q46xu0I7BQRG 5Y0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature:arc-authentication-results; bh=BB2v6GcgGeTULRT6gkaEbBNTeqTybd+VWtrgeGxX36M=; b=0CUP0iOhE9NUNkcYzxqG1+kE1Hd+4MtbqCOJdH77JS5AOGBVaepBtKDYAmYGSp3Dne 0Vq5P7aaNJwLSo6nZVgdOWi6F9s6RwoOuKkQTjuz0ckDw3OBCbU1D5AqG/FcmIUNWmoM hOVS9HxGjMGWs8jxVrUTKi6I+9sNc4gMWxOYKY9pCR5rlTtU/NeW8kVruxNn40pelqBY tuLOgalksuBws7fXZzi0HpWXHr8wptiBNWqfurBnA++0/MW8khWLp201j4QYO0Iy1QtD GlTMfWlKute4mGn/N8p6o8OY1BJrraDrqd8+RswojbnXUenR23tH3gIlxuUwNwnmA+Nj WPQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.b=UIjJ5FXh; 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 l23si928784pgo.408.2017.07.19.19.09.23; Wed, 19 Jul 2017 19:09:24 -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=UIjJ5FXh; 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 S933798AbdGTCH3 (ORCPT + 25 others); Wed, 19 Jul 2017 22:07:29 -0400 Received: from fllnx209.ext.ti.com ([198.47.19.16]:41990 "EHLO fllnx209.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753545AbdGTCHF (ORCPT ); Wed, 19 Jul 2017 22:07:05 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v6K26dqs008609; Wed, 19 Jul 2017 21:06:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1500516399; bh=DTcPufckXQ3uqr/i12FOr16S3tgKImfxvhIn7JLLt0s=; h=From:To:CC:Subject:Date; b=UIjJ5FXh1YScBQg3zM1/rVv46yZMqk6MWtQC5aYCYlKn6oOWEQ42RPUiIf0JpfDIQ +axolsaOojhuY/hg0H0bRGaNHav+M6KuIxM7IJxvzlr7kOCkOpZvmtBT0vzXcypr3N 1vPJzN9r/WZbICCO3ZiuiMLFMygyxmydBTxf7vn0= Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v6K26YTd008832; Wed, 19 Jul 2017 21:06:34 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Wed, 19 Jul 2017 21:06:34 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v6K26YiY027525; Wed, 19 Jul 2017 21:06:34 -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 v6K26Y309309; Wed, 19 Jul 2017 21:06:34 -0500 (CDT) From: Suman Anna To: Bjorn Andersson , Ohad Ben-Cohen CC: , , Suman Anna Subject: [PATCH] remoteproc: Merge __rproc_boot() with rproc_boot() Date: Wed, 19 Jul 2017 21:06:28 -0500 Message-ID: <20170720020628.10917-1-s-anna@ti.com> X-Mailer: git-send-email 2.13.1 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. Signed-off-by: Suman Anna --- drivers/remoteproc/remoteproc_core.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) -- 2.13.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 564061dcc019..6224f1036c19 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -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); /**