From patchwork Fri Feb 14 10:29:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24616 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 52F5F203C4 for ; Fri, 14 Feb 2014 10:33:23 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id v10sf25021032pde.5 for ; Fri, 14 Feb 2014 02:33:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=+J2peeoheTYwDDoqYcunGrvPtaJ/MROuPXMU/l8qWUg=; b=kXW+RVkvjAAZ3tOG1YFBOyTJBhp0tPmp3yctxO/erTNayvf0bv4TFjz/XBv57iubqb wdDqkOgY6EenXHbrLo3Mq2anLNxfXenEBwS3MUsq/1dzu8qsIdcS8kJCEuEIrtzlSRss XGCLpFhtKVax7MoQwCy6zf6KXFafsGwj9l/f5N7C7lTcA4H/Fwe7KgYfrY5OgWeBQfoX 0X8CCMXdEhT1WsEOXxZLtsk+h/p4XlWmbJ99v+O77od8uIftihUKd8IO5Ub14LQl+2I2 sR8OVvoYuUER71mqoCNvw3/sGMgAPuWHbeXyAFNQl34/zSlEyuSXpStY0SC0qMZD+NmZ eKqQ== X-Gm-Message-State: ALoCoQlCfydWBLSatIb5mlF4fCTY4tGqwiFfiv/+A2AYP48yTt1dm/BZmb0lrHajgH1lD56g4MwG X-Received: by 10.67.4.202 with SMTP id cg10mr2630781pad.42.1392374002571; Fri, 14 Feb 2014 02:33:22 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.69 with SMTP id s63ls34507qgd.28.gmail; Fri, 14 Feb 2014 02:33:22 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr653882vco.25.1392374002453; Fri, 14 Feb 2014 02:33:22 -0800 (PST) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id w5si1772401vcn.101.2014.02.14.02.33.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Feb 2014 02:33:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id pa12so9451245veb.2 for ; Fri, 14 Feb 2014 02:33:22 -0800 (PST) X-Received: by 10.220.188.10 with SMTP id cy10mr635388vcb.36.1392374001982; Fri, 14 Feb 2014 02:33:21 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp98012vcz; Fri, 14 Feb 2014 02:33:21 -0800 (PST) X-Received: by 10.194.85.75 with SMTP id f11mr1266222wjz.47.1392374001022; Fri, 14 Feb 2014 02:33:21 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id p5si778522wiv.23.2014.02.14.02.33.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Feb 2014 02:33:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEG2b-0007T3-0E; Fri, 14 Feb 2014 10:30:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEG2S-0004ep-VT; Fri, 14 Feb 2014 10:30:32 +0000 Received: from mail-we0-f171.google.com ([74.125.82.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WEG2D-0004ak-Lh for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2014 10:30:19 +0000 Received: by mail-we0-f171.google.com with SMTP id u56so8474420wes.2 for ; Fri, 14 Feb 2014 02:29:54 -0800 (PST) X-Received: by 10.180.164.174 with SMTP id yr14mr1590670wib.18.1392373794627; Fri, 14 Feb 2014 02:29:54 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id t6sm3227388wix.4.2014.02.14.02.29.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Feb 2014 02:29:53 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Will Deacon , Jonathan Austin Subject: [PATCH 1/6] ARM: integrator: localize the lm.h header Date: Fri, 14 Feb 2014 11:29:26 +0100 Message-Id: <1392373771-17303-2-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392373771-17303-1-git-send-email-linus.walleij@linaro.org> References: <1392373771-17303-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140214_053017_908233_390E92C9 X-CRM114-Status: GOOD ( 15.37 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.171 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij , Russell King , Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 As we move toward multiplatform support for the Integrator family we need to localize all headers. This moves the lm.h header down to the machine folder as it is not used outside it anyway. Cc: Will Deacon Cc: Jonathan Austin Cc: Russell King Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/impd1.c | 2 +- arch/arm/mach-integrator/include/mach/lm.h | 23 ----------------------- arch/arm/mach-integrator/integrator_ap.c | 3 +-- arch/arm/mach-integrator/integrator_cp.c | 3 --- arch/arm/mach-integrator/lm.c | 2 +- arch/arm/mach-integrator/lm.h | 23 +++++++++++++++++++++++ 6 files changed, 26 insertions(+), 30 deletions(-) delete mode 100644 arch/arm/mach-integrator/include/mach/lm.h create mode 100644 arch/arm/mach-integrator/lm.h diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index d9b784824808..a90e83fe8776 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -25,9 +25,9 @@ #include #include -#include #include #include +#include "lm.h" static int module_id; diff --git a/arch/arm/mach-integrator/include/mach/lm.h b/arch/arm/mach-integrator/include/mach/lm.h deleted file mode 100644 index 28186b6f2c09..000000000000 --- a/arch/arm/mach-integrator/include/mach/lm.h +++ /dev/null @@ -1,23 +0,0 @@ - -struct lm_device { - struct device dev; - struct resource resource; - unsigned int irq; - unsigned int id; -}; - -struct lm_driver { - struct device_driver drv; - int (*probe)(struct lm_device *); - void (*remove)(struct lm_device *); - int (*suspend)(struct lm_device *, pm_message_t); - int (*resume)(struct lm_device *); -}; - -int lm_driver_register(struct lm_driver *drv); -void lm_driver_unregister(struct lm_driver *drv); - -int lm_device_register(struct lm_device *dev); - -#define lm_get_drvdata(lm) dev_get_drvdata(&(lm)->dev) -#define lm_set_drvdata(lm,d) dev_set_drvdata(&(lm)->dev, d) diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index fedcd2fab094..f4ef41707046 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -51,8 +51,6 @@ #include /* HZ */ #include -#include - #include #include #include @@ -61,6 +59,7 @@ #include "cm.h" #include "common.h" #include "pci_v3.h" +#include "lm.h" /* Base address to the AP system controller */ void __iomem *ap_syscon_base; diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 0ad5f60598c8..9af1ed995faa 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -32,9 +32,6 @@ #include #include #include - -#include - #include #include #include diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c index f52c7af31eaa..3f9e9f043168 100644 --- a/arch/arm/mach-integrator/lm.c +++ b/arch/arm/mach-integrator/lm.c @@ -12,7 +12,7 @@ #include #include -#include +#include "lm.h" #define to_lm_device(d) container_of(d, struct lm_device, dev) #define to_lm_driver(d) container_of(d, struct lm_driver, drv) diff --git a/arch/arm/mach-integrator/lm.h b/arch/arm/mach-integrator/lm.h new file mode 100644 index 000000000000..28186b6f2c09 --- /dev/null +++ b/arch/arm/mach-integrator/lm.h @@ -0,0 +1,23 @@ + +struct lm_device { + struct device dev; + struct resource resource; + unsigned int irq; + unsigned int id; +}; + +struct lm_driver { + struct device_driver drv; + int (*probe)(struct lm_device *); + void (*remove)(struct lm_device *); + int (*suspend)(struct lm_device *, pm_message_t); + int (*resume)(struct lm_device *); +}; + +int lm_driver_register(struct lm_driver *drv); +void lm_driver_unregister(struct lm_driver *drv); + +int lm_device_register(struct lm_device *dev); + +#define lm_get_drvdata(lm) dev_get_drvdata(&(lm)->dev) +#define lm_set_drvdata(lm,d) dev_set_drvdata(&(lm)->dev, d)