From patchwork Thu Jul 23 07:10:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 499234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C68BD1401CB for ; Thu, 23 Jul 2015 17:10:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752554AbbGWHKH (ORCPT ); Thu, 23 Jul 2015 03:10:07 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:34900 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751173AbbGWHKG (ORCPT ); Thu, 23 Jul 2015 03:10:06 -0400 Received: by lblf12 with SMTP id f12so151309807lbl.2 for ; Thu, 23 Jul 2015 00:10:05 -0700 (PDT) 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; bh=GXptbV64O7v4pmuC2rB2uTaav7GYBahHvkYrFrqKdyc=; b=D2rnrigXP5UAgYE6QAnrrd5/Qwgl7nsR9f9xqJT54fDvaxp7VcStQWymafbbUCCbki wRmEJhvflKXxOeIEMtkf6b8fkWGAJxr0zImhqbprVWnuv55IyBplLZpSh1KIggOzntDb 0ZxmQoub8Ai2JWs15mckRTfYqM9JUHI4GmM8Vmba8910oQzQvLO5k3dAOTPWt/xoeQFh rjTUFArelDZCx2EGghs//+UOZ6e4pPndmR0njgac7OFCydOJeeL7WNNuNkP27JJ62NoD VwVr9urxrKPSxJZBanaU4LY6hsQgJtbv+/1Uc8qifFqDbFZDC8JTPZwesBhgtHct9VSP 76sA== X-Gm-Message-State: ALoCoQkB6zTPKwleh8JgxziDt7Oprmya75WsEfSQaPsCPqVATZ093JxpRCo7+Gox3cwSfpnex154 X-Received: by 10.153.7.166 with SMTP id dd6mr6124553lad.42.1437635404958; Thu, 23 Jul 2015 00:10:04 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id 4sm794376lai.36.2015.07.23.00.10.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jul 2015 00:10:03 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org Cc: Alexandre Courbot , Linus Walleij Subject: [PATCH 5/5] pinctrl: nomadik: depromote GPIO to subsystem_init() Date: Thu, 23 Jul 2015 09:10:00 +0200 Message-Id: <1437635400-23509-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org We no longer have to do GPIO initialization before the pinctrl initialization, instead we can initialize the pinctrl portions of the driver first and then the GPIO. Thus we can move GPIO initialization to a subsystem_initcall(), but not yet to a device_initcall(). Signed-off-by: Linus Walleij --- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index 3f53213cf89e..45c077fbe124 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -2104,15 +2104,15 @@ static struct platform_driver nmk_pinctrl_driver = { static int __init nmk_gpio_init(void) { - int ret; + return platform_driver_register(&nmk_gpio_driver); +} +subsys_initcall(nmk_gpio_init); - ret = platform_driver_register(&nmk_gpio_driver); - if (ret) - return ret; +static int __init nmk_pinctrl_init(void) +{ return platform_driver_register(&nmk_pinctrl_driver); } - -core_initcall(nmk_gpio_init); +core_initcall(nmk_pinctrl_init); MODULE_AUTHOR("Prafulla WADASKAR and Alessandro Rubini"); MODULE_DESCRIPTION("Nomadik GPIO Driver");