From patchwork Sun Oct 27 15:53:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185074 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="EtfW0Arz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9D0LWGz9sPL for ; Mon, 28 Oct 2019 03:10:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CEB6DC21E50; Sun, 27 Oct 2019 16:00:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 032B4C21E9F; Sun, 27 Oct 2019 15:56:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 726D9C21DF3; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id 48389C21C57 for ; Sun, 27 Oct 2019 15:55:09 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id r144so7718115iod.8 for ; Sun, 27 Oct 2019 08:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zrLbXeUK8GNk0uzvnILAjGsPP5Oiw8KUKykHO0sOkKA=; b=EtfW0ArzbRTVlZwQBghbwz/Pnb7tCuEWB6L6167oufbx/n2vQ7y9el9x+TERZ/p4Ha lKbfFcXBfeabL0LG4ANu+hftsrjQXFBaUCSg38dmk+dUfCT6NT9mSX8Zcd1P/YQrXdyC lPZYoVI7sWj7L9xbmSIbKaI6mX0+yov6vqyY0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zrLbXeUK8GNk0uzvnILAjGsPP5Oiw8KUKykHO0sOkKA=; b=dxX9W6FN0BzIH1Q2gwOGTZbJYiGLh87j8W4P51m1U7NzQBMbGstDvB9/QxOVHw+kO8 +NmSRyY8bCvsvbcv2k34rSRdzjtzhsEM7ZZqV0eAkZbSsB/wfxtcO5Zy+z9tcVd54FUx EAag32hnHnAVC+uBinF3OB6odp2P9jRALA40UtQGGnfkg1cXsjvw2ZuRTCroxi3Vzctu b4Lpy4WD8MncZ1LiSVT9COL673MqaugHd4xSkC8DiEw/2Xt8XupL+aw3ap/4BvQTdjHL EhoJ5UQbSDM7rVR3u6T7OM/X4V8PKo6W7L/ZeKG0Y7brQulRypmwOD47u1rJc1I+grFs uhAA== X-Gm-Message-State: APjAAAWiliPhnSjH0CbDghhdI7PyiOuTL7PDGyzXK9kJKDmWNPv8pxfC W3oZglq3e6BF4YAK5ZW1bKEixEGctRPGCw== X-Google-Smtp-Source: APXvYqzt9WfSxoJJB8nRQeaI5uGI/QIUQu9oalHJVOtmgyAQR3qgZnfNpP5OXK+FjfKfnerFTK1UYQ== X-Received: by 2002:a5d:87ce:: with SMTP id q14mr13029837ios.278.1572191708125; Sun, 27 Oct 2019 08:55:08 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:07 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:57 -0600 Message-Id: <20191027155410.187957-17-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Lukasz Majewski , Sven Schwermer Subject: [U-Boot] [PATCH 17/30] power: Tidy up inclusion of regulator_common.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This file should not include common.h and dm.h so remove them. Also move the inclusion of this file to after the normal includes. Signed-off-by: Simon Glass --- drivers/power/regulator/fixed.c | 3 ++- drivers/power/regulator/gpio-regulator.c | 3 ++- drivers/power/regulator/regulator_common.c | 4 +++- drivers/power/regulator/regulator_common.h | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index 763e671d54..5c93e6523b 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -5,13 +5,14 @@ * Przemyslaw Marczak */ -#include "regulator_common.h" #include #include #include #include #include +#include "regulator_common.h" + static int fixed_regulator_ofdata_to_platdata(struct udevice *dev) { struct dm_regulator_uclass_platdata *uc_pdata; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index ec1dcb64b3..730aea833f 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -4,7 +4,6 @@ * Keerthy */ -#include "regulator_common.h" #include #include #include @@ -14,6 +13,8 @@ #include #include +#include "regulator_common.h" + #define GPIO_REGULATOR_MAX_STATES 2 DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 2041086567..242668a55b 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -4,10 +4,12 @@ * Sven Schwermer */ -#include "regulator_common.h" #include +#include #include +#include "regulator_common.h" + int regulator_common_ofdata_to_platdata(struct udevice *dev, struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name) { diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index 18a525880a..bf80439c78 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -7,9 +7,7 @@ #ifndef _REGULATOR_COMMON_H #define _REGULATOR_COMMON_H -#include #include -#include struct regulator_common_platdata { struct gpio_desc gpio; /* GPIO for regulator enable control */