From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v1] dmaengine: idma64: Move driver name to the header From: Andy Shevchenko Message-Id: <20190409150219.15094-1-andriy.shevchenko@linux.intel.com> Date: Tue, 9 Apr 2019 18:02:19 +0300 To: Vinod Koul , dmaengine@vger.kernel.org, Lee Jones , linux-kernel@vger.kernel.org Cc: Andy Shevchenko List-ID: VGhlcmUgYXJlIHR3byBkcml2ZXJzIHRoYXQgYXJlIHJlbHlpbmcgb24gdGhlIGlETUEgNjQtYml0 IGRyaXZlciBuYW1lCnRvIG1hdGNoLiBJbnN0ZWFkIG9mIGR1cGxpY2F0aW5nIHN0cmluZyBpbiBi b3RoIG9mIHRoZW0sIGRlZGljYXRlCmEgaGVhZGVyIGZpbGUgYW5kIHNoYXJlIGl0IGJldHdlZW4g dXNlcnMuCgpTaWduZWQtb2ZmLWJ5OiBBbmR5IFNoZXZjaGVua28gPGFuZHJpeS5zaGV2Y2hlbmtv QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2RtYS9pZG1hNjQuYyAgICAgICB8ICA5ICsr KystLS0tLQogZHJpdmVycy9tZmQvaW50ZWwtbHBzcy5jICAgfCAgNCArKy0tCiBpbmNsdWRlL2xp bnV4L2RtYS9pZG1hNjQuaCB8IDE0ICsrKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDIw IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgaW5jbHVk ZS9saW51eC9kbWEvaWRtYTY0LmgKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9pZG1hNjQuYyBi L2RyaXZlcnMvZG1hL2lkbWE2NC5jCmluZGV4IDBiYWY5Nzk3Y2MwOS4uNDE4MGNmMTk3ODIzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2RtYS9pZG1hNjQuYworKysgYi9kcml2ZXJzL2RtYS9pZG1hNjQu YwpAQCAtMTksMTAgKzE5LDkgQEAKICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4K ICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CiAKLSNpbmNsdWRlICJpZG1hNjQuaCIKKyNpbmNsdWRl IDxsaW51eC9kbWEvaWRtYTY0Lmg+CiAKLS8qIFBsYXRmb3JtIGRyaXZlciBuYW1lICovCi0jZGVm aW5lIERSVl9OQU1FCQkiaWRtYTY0IgorI2luY2x1ZGUgImlkbWE2NC5oIgogCiAvKiBGb3Igbm93 IHdlIHN1cHBvcnQgb25seSB0d28gY2hhbm5lbHMgKi8KICNkZWZpbmUgSURNQTY0X05SX0NIQU4J CTIKQEAgLTY5Nyw3ICs2OTYsNyBAQCBzdGF0aWMgc3RydWN0IHBsYXRmb3JtX2RyaXZlciBpZG1h NjRfcGxhdGZvcm1fZHJpdmVyID0gewogCS5wcm9iZQkJPSBpZG1hNjRfcGxhdGZvcm1fcHJvYmUs CiAJLnJlbW92ZQkJPSBpZG1hNjRfcGxhdGZvcm1fcmVtb3ZlLAogCS5kcml2ZXIgPSB7Ci0JCS5u YW1lCT0gRFJWX05BTUUsCisJCS5uYW1lCT0gTFBTU19JRE1BNjRfRFJJVkVSX05BTUUsCiAJCS5w bQk9ICZpZG1hNjRfZGV2X3BtX29wcywKIAl9LAogfTsKQEAgLTcwNyw0ICs3MDYsNCBAQCBtb2R1 bGVfcGxhdGZvcm1fZHJpdmVyKGlkbWE2NF9wbGF0Zm9ybV9kcml2ZXIpOwogTU9EVUxFX0xJQ0VO U0UoIkdQTCB2MiIpOwogTU9EVUxFX0RFU0NSSVBUSU9OKCJpRE1BNjQgY29yZSBkcml2ZXIiKTsK IE1PRFVMRV9BVVRIT1IoIkFuZHkgU2hldmNoZW5rbyA8YW5kcml5LnNoZXZjaGVua29AbGludXgu aW50ZWwuY29tPiIpOwotTU9EVUxFX0FMSUFTKCJwbGF0Zm9ybToiIERSVl9OQU1FKTsKK01PRFVM RV9BTElBUygicGxhdGZvcm06IiBMUFNTX0lETUE2NF9EUklWRVJfTkFNRSk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL21mZC9pbnRlbC1scHNzLmMgYi9kcml2ZXJzL21mZC9pbnRlbC1scHNzLmMKaW5k ZXggNTBiZmZjMzM4MmQ3Li40NTIyMWUwOTJlY2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWZkL2lu dGVsLWxwc3MuYworKysgYi9kcml2ZXJzL21mZC9pbnRlbC1scHNzLmMKQEAgLTI4LDYgKzI4LDgg QEAKICNpbmNsdWRlIDxsaW51eC9zZXFfZmlsZS5oPgogI2luY2x1ZGUgPGxpbnV4L2lvLTY0LW5v bmF0b21pYy1sby1oaS5oPgogCisjaW5jbHVkZSA8bGludXgvZG1hL2lkbWE2NC5oPgorCiAjaW5j bHVkZSAiaW50ZWwtbHBzcy5oIgogCiAjZGVmaW5lIExQU1NfREVWX09GRlNFVAkJMHgwMDAKQEAg LTk2LDggKzk4LDYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCByZXNvdXJjZSBpbnRlbF9scHNzX2lk bWE2NF9yZXNvdXJjZXNbXSA9IHsKIAlERUZJTkVfUkVTX0lSUSgwKSwKIH07CiAKLSNkZWZpbmUg TFBTU19JRE1BNjRfRFJJVkVSX05BTUUJCSJpZG1hNjQiCi0KIC8qCiAgKiBDZWxscyBuZWVkcyB0 byBiZSBvcmRlcmVkIHNvIHRoYXQgdGhlIGlETUEgaXMgY3JlYXRlZCBmaXJzdC4gVGhpcyBpcwog ICogYmVjYXVzZSB3ZSBuZWVkIHRvIGJlIHN1cmUgdGhlIERNQSBpcyBhdmFpbGFibGUgd2hlbiB0 aGUgaG9zdCBjb250cm9sbGVyCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2RtYS9pZG1hNjQu aCBiL2luY2x1ZGUvbGludXgvZG1hL2lkbWE2NC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMC4uNjIxY2ZhZTYwNTU0Ci0tLSAvZGV2L251bGwKKysrIGIvaW5jbHVkZS9s aW51eC9kbWEvaWRtYTY0LmgKQEAgLTAsMCArMSwxNCBAQAorLyogU1BEWC1MaWNlbnNlLUlkZW50 aWZpZXI6IEdQTC0yLjAgKi8KKy8qCisgKiBEZWZpbml0aW9ucyBmb3IgdGhlIEludGVsIGludGVn cmF0ZWQgRE1BIDY0LWJpdAorICoKKyAqIENvcHlyaWdodCAoQykgMjAxOSBJbnRlbCBDb3Jwb3Jh dGlvbgorICovCisKKyNpZm5kZWYgX19MSU5VWF9ETUFfSURNQTY0X0hfXworI2RlZmluZSBfX0xJ TlVYX0RNQV9JRE1BNjRfSF9fCisKKy8qIFBsYXRmb3JtIGRyaXZlciBuYW1lICovCisjZGVmaW5l IExQU1NfSURNQTY0X0RSSVZFUl9OQU1FCQkiaWRtYTY0IgorCisjZW5kaWYgLyogX19MSU5VWF9E TUFfSURNQTY0X0hfXyAqLwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A58B3C10F0E for ; Tue, 9 Apr 2019 15:02:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E3FA20833 for ; Tue, 9 Apr 2019 15:02:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726509AbfDIPCX (ORCPT ); Tue, 9 Apr 2019 11:02:23 -0400 Received: from mga06.intel.com ([134.134.136.31]:59868 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726511AbfDIPCX (ORCPT ); Tue, 9 Apr 2019 11:02:23 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 08:02:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,329,1549958400"; d="scan'208";a="162750400" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 09 Apr 2019 08:02:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id CFD6BFA; Tue, 9 Apr 2019 18:02:19 +0300 (EEST) From: Andy Shevchenko To: Vinod Koul , dmaengine@vger.kernel.org, Lee Jones , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1] dmaengine: idma64: Move driver name to the header Date: Tue, 9 Apr 2019 18:02:19 +0300 Message-Id: <20190409150219.15094-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID: <20190409150219.TcbKR8HgXV8PcMUANSokhLFpA9MD3zz4T1W2pAAudU0@z> There are two drivers that are relying on the iDMA 64-bit driver name to match. Instead of duplicating string in both of them, dedicate a header file and share it between users. Signed-off-by: Andy Shevchenko --- drivers/dma/idma64.c | 9 ++++----- drivers/mfd/intel-lpss.c | 4 ++-- include/linux/dma/idma64.h | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 include/linux/dma/idma64.h diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index 0baf9797cc09..4180cf197823 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c @@ -19,10 +19,9 @@ #include #include -#include "idma64.h" +#include -/* Platform driver name */ -#define DRV_NAME "idma64" +#include "idma64.h" /* For now we support only two channels */ #define IDMA64_NR_CHAN 2 @@ -697,7 +696,7 @@ static struct platform_driver idma64_platform_driver = { .probe = idma64_platform_probe, .remove = idma64_platform_remove, .driver = { - .name = DRV_NAME, + .name = LPSS_IDMA64_DRIVER_NAME, .pm = &idma64_dev_pm_ops, }, }; @@ -707,4 +706,4 @@ module_platform_driver(idma64_platform_driver); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("iDMA64 core driver"); MODULE_AUTHOR("Andy Shevchenko "); -MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("platform:" LPSS_IDMA64_DRIVER_NAME); diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c index 50bffc3382d7..45221e092ecf 100644 --- a/drivers/mfd/intel-lpss.c +++ b/drivers/mfd/intel-lpss.c @@ -28,6 +28,8 @@ #include #include +#include + #include "intel-lpss.h" #define LPSS_DEV_OFFSET 0x000 @@ -96,8 +98,6 @@ static const struct resource intel_lpss_idma64_resources[] = { DEFINE_RES_IRQ(0), }; -#define LPSS_IDMA64_DRIVER_NAME "idma64" - /* * Cells needs to be ordered so that the iDMA is created first. This is * because we need to be sure the DMA is available when the host controller diff --git a/include/linux/dma/idma64.h b/include/linux/dma/idma64.h new file mode 100644 index 000000000000..621cfae60554 --- /dev/null +++ b/include/linux/dma/idma64.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Definitions for the Intel integrated DMA 64-bit + * + * Copyright (C) 2019 Intel Corporation + */ + +#ifndef __LINUX_DMA_IDMA64_H__ +#define __LINUX_DMA_IDMA64_H__ + +/* Platform driver name */ +#define LPSS_IDMA64_DRIVER_NAME "idma64" + +#endif /* __LINUX_DMA_IDMA64_H__ */ -- 2.20.1