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: 78384 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp560635qge; Wed, 19 Oct 2016 19:41:15 -0700 (PDT) X-Received: by 10.98.158.91 with SMTP id s88mr16931517pfd.107.1476931275695; Wed, 19 Oct 2016 19:41:15 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b4si7774891pge.46.2016.10.19.19.41.15; Wed, 19 Oct 2016 19:41:15 -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=@linaro.org; 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=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933932AbcJTCkg (ORCPT + 27 others); Wed, 19 Oct 2016 22:40:36 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:36093 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933884AbcJTCkc (ORCPT ); Wed, 19 Oct 2016 22:40:32 -0400 Received: by mail-pf0-f175.google.com with SMTP id e6so26529103pfk.3 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=FPm+VzR6JUZBicbo2Hvsbh3vWCdh5YXczTle19oVFsf2Kr672zBbRlLAzZrPdM8xFV fEF0EmsGe68YCDE6vtqaFzKfC43so5hjWptTKiSK4S2ne1GFwF8mjXBBb1s7EgaNs5C8 l6YIDcljIJgNDx24PTjxzU5DmS2Ivx/slL1kNPgcZS5Kf8F0xG3cc5mxjRlceD8vewQk lBoIohjnvFJZ84x/pYEtRZjzBYRhwEthfB9ijKWmAtZY6Ng4EyMEIBCixlr3FS7Lot/5 Y3fJaUO6msT+L5bU/V60UXyHqc8erOKrJ+wxxXx7+OAQ1ShnpKHAg/KHA7cxeRMhEmle 7xow== X-Gm-Message-State: AA6/9RlXDXCXKMuQf9ex16jmqXkS5afbuhB7dTy4GHJKY2eLOHK0VCqIdbRTDpG5IHJLFmC6 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.5.0 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) {