From patchwork Fri Feb 5 13:29:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Egger X-Patchwork-Id: 44627 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4C5BFB7CC1 for ; Sat, 6 Feb 2010 00:29:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932385Ab0BEN3r (ORCPT ); Fri, 5 Feb 2010 08:29:47 -0500 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:57674 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932091Ab0BEN3q (ORCPT ); Fri, 5 Feb 2010 08:29:46 -0500 Received: from faui49h (faui49h.informatik.uni-erlangen.de [131.188.42.58]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 54BA85F0D0; Fri, 5 Feb 2010 14:29:44 +0100 (MET) Received: by faui49h (sSMTP sendmail emulation); Fri, 05 Feb 2010 14:29:59 +0100 Date: Fri, 5 Feb 2010 14:29:59 +0100 From: Christoph Egger To: Jeff Garzik , Erik Inge Bols?? , Bartlomiej Zolnierkiewicz , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vamos@i4.informatik.uni-erlangen.de, Alan Cox Subject: [PATCH] non-existant config in kernel source (CONFIG_AHCI) Message-ID: <20100205132959.GB6874@faui49.informatik.uni-erlangen.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Hi all! As part of the VAMOS[0] research project at the University of Erlangen we're checking referential integrity between kernel KConfig options and in-code Conditional blocks. While there's one place that is checking for CONFIG_AHCI, this config being referenced from printed books and people pointing to this config item I can't find it anywhere in the kernel kconfig infrastruture and it doesn't seem to ever have been there (since git). Is this maybe a typo for CONFIG_SATA_AHCI? reading the information for the affected piece of source it would actually make sense. Please keep me informed of this patch getting confirmed / merged so we can keep track of it. Regards Christoph Egger [0] http://vamos1.informatik.uni-erlangen.de/ ---- From 60136f94d9c97f9a788738e30731e25bd794322b Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Fri, 5 Feb 2010 13:26:33 +0100 Subject: [PATCH] CONFIG_AHCI is really CONFIG_SATA_AHCI The marvell driver comtains a fallback to ahci for the sata ports which is incorrectly checked as CONFIG_AHCI while the only AHCI config item is actually called SATA_AHCI (which also sounds sensible considering it's a fallback for the sata ports). Signed-off-by: Christoph Egger --- drivers/ata/pata_marvell.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index 950da39..eabd138 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -147,7 +147,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i if (pdev->device == 0x6101) ppi[1] = &ata_dummy_port_info; -#if defined(CONFIG_AHCI) || defined(CONFIG_AHCI_MODULE) +#if defined(CONFIG_SATA_AHCI) || defined(SATA_CONFIG_AHCI_MODULE) if (!marvell_pata_active(pdev)) { printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n"); return -ENODEV;