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: 843452 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hswL5eUg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yp9vm6RFVz9t9t for ; Fri, 1 Dec 2017 21:47:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750877AbdLAKrb (ORCPT ); Fri, 1 Dec 2017 05:47:31 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:35980 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735AbdLAKra (ORCPT ); Fri, 1 Dec 2017 05:47:30 -0500 Received: by mail-wr0-f193.google.com with SMTP id v105so9579911wrc.3; Fri, 01 Dec 2017 02:47:29 -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=FFRjO1j6H3W5OOwgChrNPmpR4CeXIS/pkxAN4z9HNbjOpUnTQh5Oe5bGeB9ZU6z/dy hHXhBq0DFOvkTAwBC1L8yfsZEo+fT42hVJjahto6KPpP7xHMMlGwFdcGz7kGQ+OpZ7dQ UOIFDTxG2Du1TSqEM8kRymfASJtPEyK3FReLJT8YJoEj2WHxMADVOoSWTsBRHbw3tq0C WbuiQPtfVCJ6mE6gAdwEm02mgpJ6xQ1tusdwsKt2eRxjeAlc1J01yQhlrQmyWaSJOFG0 9QdFPrTmwxG89dn5X+cRS0v1UvqPkRspENMyAFFz4wZ2Zb3Xs7P9K0Yem4uDvjhRI7Y6 I2dw== X-Gm-Message-State: AJaThX5iUFw/vkM1wc3uHu7Q3/olRPdpuUZxYi7nYt91xyN7XPkbiB/v jVI6ikYrkCaKeErItiNF5y4= 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 Cc: matthias.bgg@gmail.com, linux-ide@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Matthias Brugger 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 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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)