From patchwork Thu Oct 20 02:40:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9385779 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 D9EAA60487 for ; Thu, 20 Oct 2016 02:41:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBE7B2993D for ; Thu, 20 Oct 2016 02:41:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C059F2998F; Thu, 20 Oct 2016 02:41: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 1EF1C2993D for ; Thu, 20 Oct 2016 02:41:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933894AbcJTCke (ORCPT ); Wed, 19 Oct 2016 22:40:34 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:32768 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933798AbcJTCkc (ORCPT ); Wed, 19 Oct 2016 22:40:32 -0400 Received: by mail-pf0-f169.google.com with SMTP id 128so26595560pfz.0 for ; Wed, 19 Oct 2016 19:40:32 -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=zaufvZH+NGoq+wDBwVGwvF0U0z+KqkKLVAqcy5HkWPc=; b=ip21IB7Vb4OHGH/AqH0U1gGfVlQ2JOJ9x33ehiID3fKDUYarZcTRSYhsLZq73MGa3m zHWLdtBXWw5WhVXSWD6lBG+OS7et6LllOD+0Ps5xaQIcSMusajvRHN97ccwdzd90itJ0 djPH4ReR7SGSt4qU+92WAw+pRFGWqLzZY05Gc= 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=zaufvZH+NGoq+wDBwVGwvF0U0z+KqkKLVAqcy5HkWPc=; b=W1Kc+R7A48VV4qSmuCDcjEK6+mTfz+bG+MiPte05qbON0R7UD21HG/AJsXY4pg+rFV hjfqi0OfJydvu57joqCDGqwzda5oXhNf7+e3iHI6Bq7G0q712or39USUWovWbg2p3+9J o7HyJwzkg5SOMExjptgRhE8FQyzXByGJcud1CxAFh9i9CnpxQUYxp1mMU3XuutbhiVAi LFqEBHk2MBYfg4df4beJLqFjm67hT1xGlxucNwLYqn3gIeA5CU1Z5GyuDaPmFSWySfdO GHRJba5HdUkKmsChstlHPgXYugPzGHjgxVaoES5s5LfMyWvlHpA/z6PPoEQtvyk5GAmF /h1g== X-Gm-Message-State: AA6/9RkaZ/nVdk1Xdlldd6RcKLuWRxvsZmihGyvhonpuiisGFBZ9Es0XGACmYASsLJdAPlZ3 X-Received: by 10.99.219.81 with SMTP id x17mr11754475pgi.138.1476931231687; Wed, 19 Oct 2016 19:40:31 -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 s85sm66780616pfi.17.2016.10.19.19.40.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Oct 2016 19:40:30 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] remoteproc: Remove custom vdev handler list Date: Wed, 19 Oct 2016 19:40:11 -0700 Message-Id: <1476931212-1806-11-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1476931212-1806-1-git-send-email-bjorn.andersson@linaro.org> References: <1476931212-1806-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The vdev handler is now just another resource allocator, so handle all resource types in a single pass. Signed-off-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 57f12421fdd2..f31783d27196 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -731,10 +731,6 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = { [RSC_CARVEOUT] = (rproc_handle_resource_t)rproc_handle_carveout, [RSC_DEVMEM] = (rproc_handle_resource_t)rproc_handle_devmem, [RSC_TRACE] = (rproc_handle_resource_t)rproc_handle_trace, - [RSC_VDEV] = NULL, -}; - -static rproc_handle_resource_t rproc_vdev_handler[RSC_LAST] = { [RSC_VDEV] = (rproc_handle_resource_t)rproc_handle_vdev, }; @@ -905,13 +901,6 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) /* reset max_notifyid */ rproc->max_notifyid = -1; - /* look for virtio devices and register them */ - ret = rproc_handle_resources(rproc, tablesz, rproc_vdev_handler); - if (ret) { - dev_err(dev, "Failed to handle vdev resources: %d\n", ret); - goto clean_up; - } - /* handle fw resources which are required to boot rproc */ ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers); if (ret) {