From patchwork Mon Apr 29 10:12:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 240352 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 D8BDA2C00A5 for ; Mon, 29 Apr 2013 20:11:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643Ab3D2KLT (ORCPT ); Mon, 29 Apr 2013 06:11:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16148 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752444Ab3D2KLS (ORCPT ); Mon, 29 Apr 2013 06:11:18 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3TABDcS015314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 29 Apr 2013 06:11:13 -0400 Received: from dhcp-26-207.brq.redhat.com (dhcp-26-122.brq.redhat.com [10.34.26.122]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3TAB9dk024612 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 29 Apr 2013 06:11:12 -0400 Date: Mon, 29 Apr 2013 12:12:38 +0200 From: Alexander Gordeev To: Jeff Garzik Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, Jan Beulich Subject: [PATCH] AHCI: Make distinct names for ports in /proc/interrupts Message-ID: <20130429101237.GA27738@dhcp-26-207.brq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Currently all interrupts assigned to AHCI ports show up in '/proc/interrupts' as 'ahci'. This fix adds port numbers as suffixes and hence makes the descriptions distinct. Reported-by: Jan Beulich Signed-off-by: Alexander Gordeev --- drivers/ata/ahci.c | 6 ++++-- drivers/ata/ahci.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 3b9a7b1..dc5c1aa 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1146,10 +1146,12 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis, return -EINVAL; for (i = 0; i < n_irqs; i++) { + struct ahci_port_priv *pp = host->ports[i]->private_data; + snprintf(pp->irq_desc, sizeof(pp->irq_desc), + "%s%d", dev_driver_string(host->dev), i); rc = devm_request_threaded_irq(host->dev, irq + i, ahci_multi_irqs_intr, ahci_port_thread_fn, - IRQF_SHARED, dev_driver_string(host->dev), - host->ports[i]); + IRQF_SHARED, pp->irq_desc, host->ports[i]); if (rc) goto out_free_irqs; } diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index ed1fbc8..ceb5208 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -305,6 +305,7 @@ struct ahci_port_priv { int fbs_last_dev; /* save FBS.DEV of last FIS */ /* enclosure management info per PM slot */ struct ahci_em_priv em_priv[EM_MAX_SLOTS]; + char irq_desc[8]; /* bus + port # */ }; struct ahci_host_priv {