From patchwork Fri Jun 17 10:09:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 9183263 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 2CCCD6075F for ; Fri, 17 Jun 2016 10:18:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1991428399 for ; Fri, 17 Jun 2016 10:18:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E274283A8; Fri, 17 Jun 2016 10:18:33 +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=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 03A1D28399 for ; Fri, 17 Jun 2016 10:18:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDqpi-0006PC-VW; Fri, 17 Jun 2016 10:17:02 +0000 Received: from mail-bn1bon0088.outbound.protection.outlook.com ([157.56.111.88] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDqpJ-0005zj-P4 for linux-arm-kernel@lists.infradead.org; Fri, 17 Jun 2016 10:16:40 +0000 Received: from BY2PR03CA056.namprd03.prod.outlook.com (10.141.249.29) by SN1PR0301MB1629.namprd03.prod.outlook.com (10.162.130.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.523.12; Fri, 17 Jun 2016 10:16:15 +0000 Received: from BL2FFO11FD026.protection.gbl (2a01:111:f400:7c09::178) by BY2PR03CA056.outlook.office365.com (2a01:111:e400:2c5d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.523.12 via Frontend Transport; Fri, 17 Jun 2016 10:16:15 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD026.mail.protection.outlook.com (10.173.161.105) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Fri, 17 Jun 2016 10:16:14 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u5HAFbSq029984; Fri, 17 Jun 2016 03:16:08 -0700 From: Peter Chen To: , , , , , Subject: [PATCH 04/12] power: pwrseq: Remove mmc prefix from mmc_pwrseq Date: Fri, 17 Jun 2016 18:09:17 +0800 Message-ID: <1466158165-9380-5-git-send-email-peter.chen@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466158165-9380-1-git-send-email-peter.chen@nxp.com> References: <1466158165-9380-1-git-send-email-peter.chen@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131106321750114174; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(189998001)(68736007)(2906002)(11100500001)(4326007)(104016004)(86362001)(6806005)(77096005)(2950100001)(92566002)(47776003)(8676002)(76176999)(81166006)(81156014)(50986999)(356003)(85426001)(5003940100001)(48376002)(5001770100001)(586003)(97736004)(19580395003)(50466002)(19580405001)(87936001)(50226002)(8936002)(5008740100001)(2171001)(33646002)(229853001)(36756003)(105606002)(106466001)(2201001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1629; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD026; 1:Mkk3gWa2hf5z20I/Lg3VeFeNKpW1WabkevIZJLAuNeTl4+7pIuOz0i9XqIvTSYbvoY41FPWOxhDl0yfBxHC9kgA76/NSs9cU3quh2q/eqGvBfjdHzhBfDE0LmSYAT4RJjYbi2gdZJsDqLwAbQmSdDkEbX3ipxQ3ylj/IePcqMjugMoO+Ol2Wpb8cBnA4u5dodBJU0Gzx0YoBpO2AWu+tF3ijYaNfBWevOj0CcxXobj0zn2thLX4g24LCWnkNHZPo5FgXoBJcJO4TQ7390vuj6iCxUQUfsIe0iv9SJrKpOaCGi8oFijvKiUNv+dcXkOA/y0zTJuqGOtB4MvvwnnzgdToDEBOXY4klcxyHf+J14j++3cgXKNgtG2GGtWEOMbjcp1tJPjsCJKYN12dSBF+bkatPIEQetssd4AE5O9EDs5Nf+mNr/RAJgvIs9ELBQRUdRwOF/AdHRBqFqja6lGjfTj2leUCpwp9iOAhob2L/BAVEkq3egeEyoGN++Vn8pza6Mw9Tg5hDgWOZhsflg9qUjgYpCPb+yHUAu4zaPDORx5vaHlkMgwxk2LpDBrDYEimfjzuLdw7RJs/24yW6YgOBAcav8/ijGi3TFud1bNDKMFXiLCAPtGgHwTZhfLl5REwr MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: fe37f5c4-54c2-4bbd-de1d-08d396986a2d X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1629; 2:5PfBqHWF+nQgrHkYPzdD4R5BG33jKnXLz0IB18ZWoPPVAD8WJmWP0wzAHBhrcTqWuTVVdSQleQdGqfYF21GCSOL5CVAZW9Gk8joxwAgFbph+JXl/aZmTW/uLH2bkQzlBUTJUQQiQWD6cWbspnBRBYHjxc9FehcMY+nQpv+OYG/CMWs2fUyWiQSei2ev+WoZZ; 3:taIj+eqjgflVZK7mxGWmdwwlPjJ1J+ZhrGugk7X6dhVnU25I3q11o7nn9W6WON7whxgjaSwsUYR56YqkWDtuJyAQA2I9/zTD6dw3usU1lfZHsEKfAF6Xu1dWeRPVniVrMadUU/98QKFFtkQ0xg5vBjWAfD6RL6M9Q/BwwgL8ox+O6o5bgKo8W5rbnuOLSK8w/d/s0PYPRo1KJgf313BbsZEXIjK7jKmZC81QceFdMzs= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB1629; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1629; 25:H5oM3GaXUFy56hJN5pnHPk9f2ED6Xv2bUj1kZiS8aiGsa/QvXN8mDWRnCnX+whROK8HPFTRGWLSvZ/0kxEmwcaOlZTvOEFYRiNXZM406cJUylQqd0t3xVrTU7OgQcyW8ggYTAF//1s6YA3bypY4RkirQ+WUCFZFYIXSXzxYHcJzoQwBrCJuR+TIjTEsoeIMPQctgWjR8R4ke0SyqyJi8VNl7tY+CPN4eTr+sGhVcdBE0gs9s5rQ2Vwq+FvkIlhplnqiCJaWlHk8c6qFMcN2m2dq9vCLzeH47aEbrHdvoun7WkjyyzvWZ4qofGlRquVwfKI3PQojTcOwj69Cxr7GMr6mi+ucGCycuassFAkY2QSAeclqjtdR2FOfivlStz3+w9rLoB13uLXkmCvBayuo3sUFm2SM+7sVEIJietl22CzDxHA09sSA7K719H8m3QLWDQAsNrXDcGO3d6i9TiD40pUHRAofRvNa0c9kyjJYAmyrHeVKs4wU/zExdk52Ul32/KLYThyaeifIBtQdKUITn+rerqLA4CkfU9Gl1wR4bG9VnksGpvu1qDHeb0BocEWa8ejuXuzEq96PMs7bGti3rLhJ/FTzr0y7jGyRX5wTEp+6ptkki8ecA9nd/RKIsgRO0SjJ4oEOkMH1UD43nHe7rqfhgceErjyv1/txw3SLFVy0IQG6BFsV6eoKZDpFOH/CkZLLinFjcXyWnmZlTs/JsS6UXj9StCWBSpvMWobZKPIJsN5T7vya6AqF4n4FRQDhP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(7411616537696); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13024025)(13015025)(13018025)(13017025)(5005006)(8121501046)(3002001)(10201501046)(6055026); SRVR:SN1PR0301MB1629; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB1629; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1629; 4:LdkCCJLhvfZEjwxjO6N0pQrvMC3TXUSwGhfhlmC7QX4+vGQuUKIsmtEnEYEQMp8M0M3lNVnXa8Ei/9p1+kXU6i9Ijib9pvh/GY2mTDwTnYrOfI1vkWismz6VWf1TZj1jEM/adiyWZjmw49lXZrcSIffdpUcguffj7Y41pKhDicXvGhlc5u0nJDaVxRO5UkFYIcKY0lWMx+t94sLG2VBGUOMZhL/uSs+9FpdyFyuuYaUyy+FYK/vQtTcKSmoYxnZ/haFkH3HfNQH23BVOX+R2xLg9No1iXVK/5md3nnAu6aWgZ0AMSwxRRsS6vNQx9CYSlUyyf8kxkAb7FW6LAekvOAG6TKPf0gybLrgBs6zDWYYaKEvdFRrtx+7deB/6Ti2HsKTAft8uR7DPMacgi13OwFItVjK8aQ4rE31OX/uq5Fn82p3tpFK4hvvyuhdfsF2+IWfaYcvkp4VqHLacAG5QTmVaf64yKKjzTyWNrRi9LRDG61qs+BRju3cA5qnJ2dDJTPUsuA8XRfhIE6DGgi1Mog== X-Forefront-PRVS: 09760A0505 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB1629; 23:s3X1hlCF6DLsQXqlhfxFua6lbOEsuQzeFJOLvqw?= =?us-ascii?Q?6RAVF+G39zpogUiV4AgR9LACVSibaI32Mlu0f/DxbV8FwF6zXsBRS/NQ46E0?= =?us-ascii?Q?InxwKdF3vWRZY0c86JPozPuS7/KIw+1mJHXDQKwHMaAS3icw7YDrDIVqIogS?= =?us-ascii?Q?mAeDvpjpaTZgs5s6Fp08VnzmYtl65CghEKTa9b0a+8LbUnBrrQuVeGbrX57L?= =?us-ascii?Q?xwoKCpW5qD1jJq4c9yNQLBCMoSq5TodBgVXRjYm7+6sDPpoHa4+jkq7E8NJz?= =?us-ascii?Q?r1+gj6M6FuECMvM9awv6OWFK3WBzfAhPorGk8n8uddN4Z1CI7db4Ebpb3raa?= =?us-ascii?Q?1aPHqxGLRTMsdXqkcyrgFfB9T5SUafxLWkMFrTcDBPfHdE72blq0ZkFFBQO5?= =?us-ascii?Q?M+NoA+sqmdG3BNbvfOjT4SrOr12xDYD2UfRDjQxe4Jvc6sfHN4mx4K2lYZb5?= =?us-ascii?Q?KhMC+jdR8pLH0+o97+oRbrDIPowzMbAi3kEnbWiy2bhjkenrvHF2VLl9QPOe?= =?us-ascii?Q?meEd68wrmj2N/ALXoHY3W8Z8LBKEKmrF/4xJCKRudWfk03+azMpSXKn9uSDA?= =?us-ascii?Q?Kt9a/9V4hQUe43vWiDRzJkD8mG+sl4zkHmV0WQq538ydFuJ7eTK611fcoyDn?= =?us-ascii?Q?OpDFi6JyT5lk9ykzEHGW0A3encpTOlaQcMxUHhaK4BGyrx4SJSqgo5eegpnW?= =?us-ascii?Q?NJ0tOxUNuPAtNSZ11qOErDRh1DIbcMy8i3gNkPmzIsCjwX7HLu+KcyRbKymk?= =?us-ascii?Q?C+JOXfovbTnUvJ7eMspw/Ty1g75rWvJUeE7ICsqSrQu5hwuUYDixX64kyy/s?= =?us-ascii?Q?bepY6L/mEVb0EaMGyeScvmt8BSXeKeVLlqZVN3NrwDAb5lPhzp8ypjPis5yV?= =?us-ascii?Q?nfAFQvYsDZ154E1nPcURSByq0NzaXp8rE5QWwrJruGSO9Ix1xiuPERaVoggl?= =?us-ascii?Q?28gCWcLtvgSeFdZPU6PhEizVMnqI35dH/OajnW878NF5JlLNdh/AXawuAzNG?= =?us-ascii?Q?pQ0JA19y9QQSNHYqxoBjqhSDJAvLQuinjPY8TAMpWu/XVAQ3c5g4jD6J+PSj?= =?us-ascii?Q?LkYGwqnJtHU/uGb3ZumDydx9hLRJi7gD1uAQWssCnW6UzAezQSi//PEnwZWW?= =?us-ascii?Q?Ee+WidbyhBcT1gfr/6lHeuGru07cmdhrh?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1629; 6:qXogHjDILfV2M8rgmlkq3jckrgmiooMDm/0jOo7jvSTrpz8fa8t4XaboJ/jfsFea1YhL+kK8X++LvJDbMqOwwdLg5Z4MqG0IezhIBBm9DNeYw6RZg1RTaKPJq0Jj4T0cv6hpVucECQjOpB0I5xO1Cv5iuVeAecrAPX1CPWkpL3L5pKOfpEt+J2ajdDlImlNEe/g21d1Qw7XvRYUPqUHZxAwHN3yNCtqdD0sn9WrEW5gT9NwyIWC/LQWR/MN1arFJDg9rkw8CXf05Ffw64YXH8T1zmxLJc4YsYc+yrZylQVU=; 5:t5FR/qlsXt+YEmjRR8a4eKf+FFjksDdQzlaWqtP+7H12czcOHVUXdvFf7vMpVNnD403DERmupTuMpwzbi3B8zUS3i4La92KstWxun57DRVTLtVpPgiBjbgneGYPCUtlNA3u4BsRnnnEMXyH8PIuHbA9jTViep7PxIpCllJYczRY=; 24:jg7/9nxpRdyZTeAU0lwdCHURvH5scjk8PS/eqKz94SRFmbqzJLybsktL3DmFBTPlz8kiS+a8ncslGjjBdl9u1aPRteRmO/TP3q+AaiOHgEA=; 7:0lHvhnpVty5ae6HjLF7OTkho/PV/En/G7x5IojlcPDjaE8J0SQLCd/q09zJQae+QqApaW9QADsB9rq9OXJTz5BXJh2WiWbRclRWpP0HODFGUPycMro8bO8v1raQsdhtJiD1ht0axBv7F4eHCjO43zmfaYnaDhEVSqJiGG1cyDa65+AS37Fu3mjtCB53S6saLi+oYJZKtxxenkQYmKvcVOGx1FtUlwKia6aQhrFQUYWU9Eoij/JHGCpKbXrZf6bJq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2016 10:16:14.7306 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1629 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160617_031638_229112_5109EF12 X-CRM114-Status: GOOD ( 15.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, k.kozlowski@samsung.com, stephen.boyd@linaro.org, oscar@naiandei.net, arnd@arndb.de, pawel.moll@arm.com, linux-pm@vger.kernel.org, s.hauer@pengutronix.de, linux-usb@vger.kernel.org, linux-mmc@vger.kernel.org, mail@maciej.szmigiero.name, troy.kisky@boundarydevices.com, javier@osg.samsung.com, p.zabel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Krzysztof Kozlowski The "mmc" prefix is no longer needed after moving the pwrseq core code from mmc/ to power/. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Javier Martinez Canillas --- drivers/power/pwrseq/pwrseq.c | 18 +++++++++--------- drivers/power/pwrseq/pwrseq_emmc.c | 8 ++++---- drivers/power/pwrseq/pwrseq_simple.c | 8 ++++---- include/linux/mmc/host.h | 4 ++-- include/linux/pwrseq.h | 20 ++++++++++---------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/power/pwrseq/pwrseq.c b/drivers/power/pwrseq/pwrseq.c index 66310d7..9c66582 100644 --- a/drivers/power/pwrseq/pwrseq.c +++ b/drivers/power/pwrseq/pwrseq.c @@ -21,7 +21,7 @@ static LIST_HEAD(pwrseq_list); int mmc_pwrseq_alloc(struct mmc_host *host) { struct device_node *np; - struct mmc_pwrseq *p; + struct pwrseq *p; np = of_parse_phandle(host->parent->of_node, "mmc-pwrseq", 0); if (!np) @@ -54,7 +54,7 @@ EXPORT_SYMBOL_GPL(mmc_pwrseq_alloc); void mmc_pwrseq_pre_power_on(struct mmc_host *host) { - struct mmc_pwrseq *pwrseq = host->pwrseq; + struct pwrseq *pwrseq = host->pwrseq; if (pwrseq && pwrseq->ops->pre_power_on) pwrseq->ops->pre_power_on(host); @@ -63,7 +63,7 @@ EXPORT_SYMBOL_GPL(mmc_pwrseq_pre_power_on); void mmc_pwrseq_post_power_on(struct mmc_host *host) { - struct mmc_pwrseq *pwrseq = host->pwrseq; + struct pwrseq *pwrseq = host->pwrseq; if (pwrseq && pwrseq->ops->post_power_on) pwrseq->ops->post_power_on(host); @@ -72,7 +72,7 @@ EXPORT_SYMBOL_GPL(mmc_pwrseq_post_power_on); void mmc_pwrseq_power_off(struct mmc_host *host) { - struct mmc_pwrseq *pwrseq = host->pwrseq; + struct pwrseq *pwrseq = host->pwrseq; if (pwrseq && pwrseq->ops->power_off) pwrseq->ops->power_off(host); @@ -81,7 +81,7 @@ EXPORT_SYMBOL_GPL(mmc_pwrseq_power_off); void mmc_pwrseq_free(struct mmc_host *host) { - struct mmc_pwrseq *pwrseq = host->pwrseq; + struct pwrseq *pwrseq = host->pwrseq; if (pwrseq) { module_put(pwrseq->owner); @@ -90,7 +90,7 @@ void mmc_pwrseq_free(struct mmc_host *host) } EXPORT_SYMBOL_GPL(mmc_pwrseq_free); -int mmc_pwrseq_register(struct mmc_pwrseq *pwrseq) +int pwrseq_register(struct pwrseq *pwrseq) { if (!pwrseq || !pwrseq->ops || !pwrseq->dev) return -EINVAL; @@ -101,9 +101,9 @@ int mmc_pwrseq_register(struct mmc_pwrseq *pwrseq) return 0; } -EXPORT_SYMBOL_GPL(mmc_pwrseq_register); +EXPORT_SYMBOL_GPL(pwrseq_register); -void mmc_pwrseq_unregister(struct mmc_pwrseq *pwrseq) +void pwrseq_unregister(struct pwrseq *pwrseq) { if (pwrseq) { mutex_lock(&pwrseq_list_mutex); @@ -111,4 +111,4 @@ void mmc_pwrseq_unregister(struct mmc_pwrseq *pwrseq) mutex_unlock(&pwrseq_list_mutex); } } -EXPORT_SYMBOL_GPL(mmc_pwrseq_unregister); +EXPORT_SYMBOL_GPL(pwrseq_unregister); diff --git a/drivers/power/pwrseq/pwrseq_emmc.c b/drivers/power/pwrseq/pwrseq_emmc.c index a0583ed..a68ac9a 100644 --- a/drivers/power/pwrseq/pwrseq_emmc.c +++ b/drivers/power/pwrseq/pwrseq_emmc.c @@ -22,7 +22,7 @@ #include struct mmc_pwrseq_emmc { - struct mmc_pwrseq pwrseq; + struct pwrseq pwrseq; struct notifier_block reset_nb; struct gpio_desc *reset_gpio; }; @@ -54,7 +54,7 @@ static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this, return NOTIFY_DONE; } -static const struct mmc_pwrseq_ops mmc_pwrseq_emmc_ops = { +static const struct pwrseq_ops mmc_pwrseq_emmc_ops = { .post_power_on = mmc_pwrseq_emmc_reset, }; @@ -85,7 +85,7 @@ static int mmc_pwrseq_emmc_probe(struct platform_device *pdev) pwrseq->pwrseq.owner = THIS_MODULE; platform_set_drvdata(pdev, pwrseq); - return mmc_pwrseq_register(&pwrseq->pwrseq); + return pwrseq_register(&pwrseq->pwrseq); } static int mmc_pwrseq_emmc_remove(struct platform_device *pdev) @@ -93,7 +93,7 @@ static int mmc_pwrseq_emmc_remove(struct platform_device *pdev) struct mmc_pwrseq_emmc *pwrseq = platform_get_drvdata(pdev); unregister_restart_handler(&pwrseq->reset_nb); - mmc_pwrseq_unregister(&pwrseq->pwrseq); + pwrseq_unregister(&pwrseq->pwrseq); return 0; } diff --git a/drivers/power/pwrseq/pwrseq_simple.c b/drivers/power/pwrseq/pwrseq_simple.c index 786f1db..d5fbd65 100644 --- a/drivers/power/pwrseq/pwrseq_simple.c +++ b/drivers/power/pwrseq/pwrseq_simple.c @@ -21,7 +21,7 @@ #include struct mmc_pwrseq_simple { - struct mmc_pwrseq pwrseq; + struct pwrseq pwrseq; bool clk_enabled; struct clk *ext_clk; struct gpio_descs *reset_gpios; @@ -77,7 +77,7 @@ static void mmc_pwrseq_simple_power_off(struct mmc_host *host) } } -static const struct mmc_pwrseq_ops mmc_pwrseq_simple_ops = { +static const struct pwrseq_ops mmc_pwrseq_simple_ops = { .pre_power_on = mmc_pwrseq_simple_pre_power_on, .post_power_on = mmc_pwrseq_simple_post_power_on, .power_off = mmc_pwrseq_simple_power_off, @@ -115,14 +115,14 @@ static int mmc_pwrseq_simple_probe(struct platform_device *pdev) pwrseq->pwrseq.owner = THIS_MODULE; platform_set_drvdata(pdev, pwrseq); - return mmc_pwrseq_register(&pwrseq->pwrseq); + return pwrseq_register(&pwrseq->pwrseq); } static int mmc_pwrseq_simple_remove(struct platform_device *pdev) { struct mmc_pwrseq_simple *pwrseq = platform_get_drvdata(pdev); - mmc_pwrseq_unregister(&pwrseq->pwrseq); + pwrseq_unregister(&pwrseq->pwrseq); return 0; } diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 45cde8c..f3e29f4 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -203,7 +203,7 @@ struct mmc_context_info { }; struct regulator; -struct mmc_pwrseq; +struct pwrseq; struct mmc_supply { struct regulator *vmmc; /* Card power supply */ @@ -215,7 +215,7 @@ struct mmc_host { struct device class_dev; int index; const struct mmc_host_ops *ops; - struct mmc_pwrseq *pwrseq; + struct pwrseq *pwrseq; unsigned int f_min; unsigned int f_max; unsigned int f_init; diff --git a/include/linux/pwrseq.h b/include/linux/pwrseq.h index e230670..6d2d2a4 100644 --- a/include/linux/pwrseq.h +++ b/include/linux/pwrseq.h @@ -5,19 +5,19 @@ * * License terms: GNU General Public License (GPL) version 2 */ -#ifndef _MMC_CORE_PWRSEQ_H -#define _MMC_CORE_PWRSEQ_H +#ifndef _LINUX_PWRSEQ_H +#define _LINUX_PWRSEQ_H #include -struct mmc_pwrseq_ops { +struct pwrseq_ops { void (*pre_power_on)(struct mmc_host *host); void (*post_power_on)(struct mmc_host *host); void (*power_off)(struct mmc_host *host); }; -struct mmc_pwrseq { - const struct mmc_pwrseq_ops *ops; +struct pwrseq { + const struct pwrseq_ops *ops; struct device *dev; struct list_head pwrseq_node; struct module *owner; @@ -25,8 +25,8 @@ struct mmc_pwrseq { #ifdef CONFIG_POWER_SEQ -int mmc_pwrseq_register(struct mmc_pwrseq *pwrseq); -void mmc_pwrseq_unregister(struct mmc_pwrseq *pwrseq); +int pwrseq_register(struct pwrseq *pwrseq); +void pwrseq_unregister(struct pwrseq *pwrseq); int mmc_pwrseq_alloc(struct mmc_host *host); void mmc_pwrseq_pre_power_on(struct mmc_host *host); @@ -36,11 +36,11 @@ void mmc_pwrseq_free(struct mmc_host *host); #else /* CONFIG_POWER_SEQ */ -static inline int mmc_pwrseq_register(struct mmc_pwrseq *pwrseq) +static inline int pwrseq_register(struct pwrseq *pwrseq) { return -ENOSYS; } -static inline void mmc_pwrseq_unregister(struct mmc_pwrseq *pwrseq) {} +static inline void pwrseq_unregister(struct pwrseq *pwrseq) {} static inline int mmc_pwrseq_alloc(struct mmc_host *host) { return 0; } static inline void mmc_pwrseq_pre_power_on(struct mmc_host *host) {} static inline void mmc_pwrseq_post_power_on(struct mmc_host *host) {} @@ -49,4 +49,4 @@ static inline void mmc_pwrseq_free(struct mmc_host *host) {} #endif /* CONFIG_POWER_SEQ */ -#endif +#endif /* _LINUX_PWRSEQ_H */