From patchwork Fri Dec 1 10:47:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 10086853 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 D151E6037E for ; Fri, 1 Dec 2017 10:47:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB5082A1EB for ; Fri, 1 Dec 2017 10:47:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CFFA22A3A7; Fri, 1 Dec 2017 10:47:55 +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=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A6E22A1EB for ; Fri, 1 Dec 2017 10:47:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=nIGyimkM1383SrR081mYvBb3ZBdfxVhRL95G9EQdWxc=; b=N88 zkVsKxZxT7Pcx13wgGG9tk08ZCI4n7hFL2EB+2U/qN2U8kZMIe/4srZpn3Fkeui/4U8QP3CUKHn9c uEX+ngCeONZWVtQRGGYCgsduerZFMaT27+jWSfwZP04b2VfjS/k0qGwMBKlgN1u+nCvBtkBfVbhbi fLY44FFqkrBbqQeO1YRvwR/DAE+GDbH5oNevvuZKqMHLFWKUeiziOxaxlgbKORxoI4tT1iPrrPtIE K5hP29cMmKuvcqxvThbeB2uTEHw4yzdJGWJdUIj5pwU6YIc+AYmRxbi9Imzp9uwsxfQprOrlQTqZc ox0/0IjYxO8EU8WBI5mHMggDJ++xCLA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKirK-0002XF-Vc; Fri, 01 Dec 2017 10:47:54 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKirH-0002T0-3S; Fri, 01 Dec 2017 10:47:52 +0000 Received: by mail-wr0-x241.google.com with SMTP id z18so9629106wrb.8; Fri, 01 Dec 2017 02:47:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=09oPKwFDQ1mW7j9LC4+ZHp4HpOQdfMAeXOn/xgZxO5o=; b=hswL5eUgfUalYjFKLpYDWruBYv5VlydiqqkXHzOYUNYF3QMjYzjSXu4ayyi/mZbq10 NFE+1npw82OoXdGIGPUejlxjcrrX8cKBr6VOAmxWzDzODDwcaQOEB/kWUPwPp1nw96Pj B2zxiEsn4/XJitgZrHISuZTHd7yMQjg7wr8wQD2rDXUIV5WtBr8I7qeAkpiNkliR9qE/ RDHR3QB1DOyLxd9F35dsGEYZy8eYL2Wb4S2gf2xj050noYLPHzKZtnQji06NUFsqbG4o 2MOwfHCs8KsDp7qxY3yRDQ1HbJ0/hrO3S4MPfP8iMTR1t2M++W3Z6nPveM3QxWFZohde 1lTw== 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; bh=09oPKwFDQ1mW7j9LC4+ZHp4HpOQdfMAeXOn/xgZxO5o=; b=pjjiwEO6t/1A1VIbaLnyNJQW8KNj7F26SEFCrK/onG65aoXpR6+A9eCKuUCkUIH8OR xfWC8OpxC4UAqIkOEr87U5mHV+Ox6X0CTcusPwiSjD2ZFvk1dD9bJ/QckhwxM6+YDIKz 9WWVP3cGinZPozqSOTYQo654s7NwVkAl4ymTFdXBwduezTv4LbsFWd7IuAZ00G1A/gra 3kf8hqOrycfvzg2D7kWGXYfYtItGdpjo/usWvUvSEj7nK4c0K+wdhtNimXMooxZTQSRR YLhu5BFFiYJEeXU+n/0LrIAKJ9QKyu/DOI8jZK7obB7Fyoy1oXqJcbL/Xv/8cYjaiU8g 5riA== X-Gm-Message-State: AJaThX67lBEnWbOxi/pPCkgAme2GQqlCSfB6DQl7NAqC0NwHPDv16Sug BdjOHILHCkPDubvxwxnCzFsNbg== X-Google-Smtp-Source: AGs4zMZZCA0S0R5IkolMV6BiJfZv7SWvW2dhevlR/YrATlNs2jvK3+tUuevjyFW/IFCY0C21L9gRVw== X-Received: by 10.223.176.121 with SMTP id g54mr4988959wra.165.1512125249274; Fri, 01 Dec 2017 02:47:29 -0800 (PST) Received: from linux-gy6r.site ([47.61.68.222]) by smtp.gmail.com with ESMTPSA id 80sm817681wmk.14.2017.12.01.02.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Dec 2017 02:47:28 -0800 (PST) From: Matthias Brugger To: tj@kernel.org Subject: [PATCH 2/2] ahci: mtk: Change driver name to ahci-mtk Date: Fri, 1 Dec 2017 11:47:22 +0100 Message-Id: <20171201104722.17353-1-matthias.bgg@gmail.com> X-Mailer: git-send-email 2.12.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171201_024751_307993_2C697D47 X-CRM114-Status: GOOD ( 10.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthias Brugger , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-mediatek@lists.infradead.org, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 The driver name "ahci" is already used by the ahci platform driver. This leads to the following error: Error: Driver 'ahci' is already registered, aborting... Change the name to ahci-mtk to fix this. Signed-off-by: Matthias Brugger --- drivers/ata/ahci_mtk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ata/ahci_mtk.c b/drivers/ata/ahci_mtk.c index 80854f71559a..22efb9370d1d 100644 --- a/drivers/ata/ahci_mtk.c +++ b/drivers/ata/ahci_mtk.c @@ -25,7 +25,7 @@ #include #include "ahci.h" -#define DRV_NAME "ahci" +#define DRV_NAME "ahci-mtk" #define SYS_CFG 0x14 #define SYS_CFG_SATA_MSK GENMASK(31, 30)