From patchwork Tue Nov 17 07:31:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Mahajan X-Patchwork-Id: 38584 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 64792B7BBE for ; Tue, 17 Nov 2009 18:31:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755107AbZKQHbY (ORCPT ); Tue, 17 Nov 2009 02:31:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755356AbZKQHbY (ORCPT ); Tue, 17 Nov 2009 02:31:24 -0500 Received: from az33egw02.freescale.net ([192.88.158.103]:61277 "EHLO az33egw02.freescale.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755107AbZKQHbY (ORCPT ); Tue, 17 Nov 2009 02:31:24 -0500 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id nAH7VQIr011581; Tue, 17 Nov 2009 00:31:27 -0700 (MST) Received: from localhost.localdomain (lc0191.zin33.ap.freescale.net [10.232.1.191]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id nAH7YtqV014961; Tue, 17 Nov 2009 01:34:56 -0600 (CST) From: Vivek Mahajan To: linux-ide@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, Vivek Mahajan Subject: [PATCH 1/1] sata_sil24: MSI support cleanup Date: Tue, 17 Nov 2009 13:01:23 +0530 Message-Id: <1258443083-6203-1-git-send-email-vivek.mahajan@freescale.com> X-Mailer: git-send-email 1.5.6.5 X-Brightmail-Tracker: AAAAAQAAAWE= Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Grant Grundler suggested the following cleanup: * Rename module param 'msi' to 'sata_sil24_msi' * Remove pci_intx() as pci_enable_msi() internally takes care of it. Reviewed-by: Grant Grundler Signed-off-by: Vivek Mahajan --- drivers/ata/sata_sil24.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 1370df6..783d8c7 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c @@ -417,9 +417,9 @@ static struct ata_port_operations sil24_ops = { #endif }; -static int sata_sil24_msi; /* Disable MSI */ -module_param_named(msi, sata_sil24_msi, bool, S_IRUGO); -MODULE_PARM_DESC(msi, "Enable MSI (Default: false)"); +static int modparam_sata_sil24_msi; /* Disable MSI */ +module_param_named(sata_sil24_msi, modparam_sata_sil24_msi, bool, S_IRUGO); +MODULE_PARM_DESC(sata_sil24_msi, "Enable MSI (default: false)"); /* * Use bits 30-31 of port_flags to encode available port numbers. @@ -1344,10 +1344,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) sil24_init_controller(host); - if (sata_sil24_msi && !pci_enable_msi(pdev)) { + if (modparam_sata_sil24_msi && !pci_enable_msi(pdev)) dev_printk(KERN_INFO, &pdev->dev, "Using MSI\n"); - pci_intx(pdev, 0); - } pci_set_master(pdev); return ata_host_activate(host, pdev->irq, sil24_interrupt, IRQF_SHARED,