From patchwork Wed Jan 2 14:45:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ernest Zhang(WH)" X-Patchwork-Id: 10746473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFA7817D2 for ; Wed, 2 Jan 2019 14:46:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D867E20748 for ; Wed, 2 Jan 2019 14:46:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C997C288E6; Wed, 2 Jan 2019 14:46:04 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A17E20748 for ; Wed, 2 Jan 2019 14:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729245AbfABOqD (ORCPT ); Wed, 2 Jan 2019 09:46:03 -0500 Received: from mail-eopbgr810139.outbound.protection.outlook.com ([40.107.81.139]:6232 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726855AbfABOqD (ORCPT ); Wed, 2 Jan 2019 09:46:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=towerbridgetechnology.onmicrosoft.com; s=selector1-bayhubtech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=puT6OQDjBHFtOU1eCUcjaJPXEGIru+b2aTVmOJaSFXI=; b=NDTmfZ9JG71hShDWvWG63PqUk4PsfbzC1u4uF1ZPNgFFPgTTLzITBMRjSaoM2e+Xc5DNqN6Pfv7PR2A/8VnHNW+Tdw7HpxIM61ALcGUAh/2eWUitzuq0xKaMSR4cej7yuMqi7sPsvB5RhojnMQuYmZiyjL0ODJou4ihYNNNsDeo= Received: from SN6PR16MB2542.namprd16.prod.outlook.com (52.135.125.202) by SN6PR16MB2638.namprd16.prod.outlook.com (52.135.127.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1471.20; Wed, 2 Jan 2019 14:45:19 +0000 Received: from SN6PR16MB2542.namprd16.prod.outlook.com ([fe80::8820:cbd3:3b2a:c3b2]) by SN6PR16MB2542.namprd16.prod.outlook.com ([fe80::8820:cbd3:3b2a:c3b2%3]) with mapi id 15.20.1471.019; Wed, 2 Jan 2019 14:45:19 +0000 From: "Ernest Zhang(WH)" To: Adrian Hunter , Ulf Hansson , "linux-mmc@vger.kernel.org" CC: "Xiaoguang Yu (WH)" , "Andy Dai (WH)" , "Shirley Her (SC)" , "Mike Li (WH)" , "Ernest Zhang(WH)" Subject: [PATCH 1/2] mmc: sdhci: Moving sdhci_o2 into sdhci-pci-o2micro.c Thread-Topic: [PATCH 1/2] mmc: sdhci: Moving sdhci_o2 into sdhci-pci-o2micro.c Thread-Index: AQHUoqnIBm8kZpnCfEeN5H2svIVg2Q== Date: Wed, 2 Jan 2019 14:45:19 +0000 Message-ID: <20190102144503.22588-1-ernest.zhang@bayhubtech.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR02CA0134.apcprd02.prod.outlook.com (2603:1096:202:16::18) To SN6PR16MB2542.namprd16.prod.outlook.com (2603:10b6:805:d3::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=ernest.zhang@bayhubtech.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [221.235.47.164] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;SN6PR16MB2638;6:STDGpoM1XuL6YSibdFdk1LPacMxN9nPdycl0XiX8wsiCEfiul88hemwkPMFoJmktQyVPz+NzQj+K+/m2d/bjhnwmNSoJNBY6eL8IdJxpp42e+p0ER7ndpvYFDmQPmLhCpdFAWdZl9I3sTCo02OWESMiDLVwduRdJCW1MRKdhVJKuTCx5nZKxarzLTbnpQPBCxLXAmLgdXA19W5blhPq4nXuyqnGej+qNtV65+njAxa6h6lBxbWVWPzUTlRM3lniZGC0pqY+9872ZzsOk5zcaqnlqRGuUimUUex5DFSXpydVYg6nf6uH9M9rnuOIG6MvvCrcdwgz8moVfnOE8u8wdsVB2s8u46ibOabqUqrWyd4ZI0h9yq57+spPtae94+E89IuBgOc6WvRCMFwqI/8YjKfFVatZDjEJwtIrWTiLKOGKCP1zXFLreZHgc2u0FMVlEvG2zBMF1qXZYia4egArjxg==;5:P2g4wSjWr2Am5HRAVsWjjesYTaYEE1MS7LCP/IxLPXWc74nD8iErhEj2/LPUPprCv7Knm/BnKotw3mO19/LHgPgGyJL7psvoCtYJz96amGmjolWo1lT4LCrOImeceDFp9wMEb0qQ0AQRwS2fb9zEnil3tZIrizDhMTdMfx1/IvY=;7:qSu50tzvUBjjtkZ6TlOApCl23rrZ1T7sMWmdsCt7Y9FV1ds4I+oHSCit/Uh8BcJ1fPN6tkqZBeuvbX7H13HjVqd7MolHxmk+mKqHtXSCdPktaedDVwQxnYuG8eqwRnOS9OTLHP/xX60EtybMPT6k7Q== x-ms-office365-filtering-correlation-id: e8771b1d-a592-4802-ca79-08d670c0eab4 x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(7021145)(8989299)(4534185)(7022145)(4603075)(4627221)(201702281549075)(8990200)(7048125)(7024125)(7027125)(7023125)(5600109)(711020)(2017052603328)(7153060)(7193020);SRVR:SN6PR16MB2638; x-ms-traffictypediagnostic: SN6PR16MB2638: x-microsoft-antispam-prvs: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(3230021)(908002)(999002)(5005026)(6040522)(8220060)(2401047)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231475)(944501520)(52105112)(6041310)(20161123558120)(20161123560045)(20161123564045)(2016111802025)(20161123562045)(6043046)(201708071742011)(7699051)(76991095);SRVR:SN6PR16MB2638;BCL:0;PCL:0;RULEID:;SRVR:SN6PR16MB2638; x-forefront-prvs: 0905A6B2C7 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(39830400003)(346002)(366004)(396003)(136003)(189003)(199004)(316002)(256004)(476003)(97736004)(2501003)(71190400001)(1076003)(2616005)(25786009)(4326008)(99286004)(54906003)(36756003)(71200400001)(14444005)(6486002)(110136005)(6436002)(486006)(8676002)(68736007)(508600001)(14454004)(3846002)(81166006)(6116002)(2906002)(86362001)(575784001)(305945005)(6506007)(8936002)(5660300001)(107886003)(102836004)(105586002)(386003)(6512007)(7736002)(106356001)(186003)(52116002)(81156014)(26005)(66066001)(53936002);DIR:OUT;SFP:1102;SCL:1;SRVR:SN6PR16MB2638;H:SN6PR16MB2542.namprd16.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: bayhubtech.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: nI7RLJRLGAh+tgJp5A1HlyI8ZJWaMGv7gE0Py+3MGPASS2BvzOXkJOoPwumIJPFD0/gIOh5R/hIubCHPVE8874Qay0YRpd+Yv4pleavK8ZEAbsCPTuEwm4T4dlq6R2TjwfC9jduuudN3bemKVGvDj98/iNEYQGc9zjMbZ3iLYEHhlmh7NHp0fMCz66MV8qZfHSpiJPvBuXwrhhehEqGEVdwVC4qtRRGxNr1JW8Zjs6pPJzWHf+AoyIsq7FazKkwbuQ2nEYM10kNpLjsQqI8smwHx1Ig7GaSFMyXom6c9NB2hdu6n4mwKDUIz1atlLmCQ spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: bayhubtech.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8771b1d-a592-4802-ca79-08d670c0eab4 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2019 14:45:19.5914 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0a7aae2b-8f2e-44df-ba2f-42de7f93c642 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR16MB2638 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Moving sdhci_o2 into sdhci-pci-o2micro.c Signed-off-by: Ernest Zhang --- Change in V3: 1. Change the patches order to make this the first patch 2. Remove the other unneeded o2 declarations in sdhci-pci.h Change in V2: 1. Moving sdhci_o2 into sdhci-pci-o2micro.c Change in V1: N/A --- drivers/mmc/host/sdhci-pci-core.c | 10 ---------- drivers/mmc/host/sdhci-pci-o2micro.c | 10 ++++++++++ drivers/mmc/host/sdhci-pci.h | 6 +----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 2a6eba74b94e..99b0fec2836b 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -1257,16 +1257,6 @@ static int jmicron_resume(struct sdhci_pci_chip *chip) } #endif -static const struct sdhci_pci_fixes sdhci_o2 = { - .probe = sdhci_pci_o2_probe, - .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, - .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD, - .probe_slot = sdhci_pci_o2_probe_slot, -#ifdef CONFIG_PM_SLEEP - .resume = sdhci_pci_o2_resume, -#endif -}; - static const struct sdhci_pci_fixes sdhci_jmicron = { .probe = jmicron_probe, diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index cc3ffeffd7a2..73b49efa2316 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c @@ -60,6 +60,16 @@ #define O2_SD_VENDOR_SETTING2 0x1C8 #define O2_SD_HW_TUNING_DISABLE BIT(4) +const struct sdhci_pci_fixes sdhci_o2 = { + .probe = sdhci_pci_o2_probe, + .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, + .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD, + .probe_slot = sdhci_pci_o2_probe_slot, +#ifdef CONFIG_PM_SLEEP + .resume = sdhci_pci_o2_resume, +#endif +}; + static void sdhci_o2_set_tuning_mode(struct sdhci_host *host) { u16 reg; diff --git a/drivers/mmc/host/sdhci-pci.h b/drivers/mmc/host/sdhci-pci.h index 2ef0bdca9197..4ddb69a15cd7 100644 --- a/drivers/mmc/host/sdhci-pci.h +++ b/drivers/mmc/host/sdhci-pci.h @@ -179,13 +179,9 @@ static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot) int sdhci_pci_resume_host(struct sdhci_pci_chip *chip); #endif int sdhci_pci_enable_dma(struct sdhci_host *host); -int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot); -int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip); -#ifdef CONFIG_PM_SLEEP -int sdhci_pci_o2_resume(struct sdhci_pci_chip *chip); -#endif extern const struct sdhci_pci_fixes sdhci_arasan; extern const struct sdhci_pci_fixes sdhci_snps; +extern const struct sdhci_pci_fixes sdhci_o2; #endif /* __SDHCI_PCI_H */