The attach_msi_entry has been reduced to a single simple assignment,
so for simplicity remove the abstraction and directory perform the
assignment.
Signed-off-by: Eric W. Biederman <redacted>
---
drivers/pci/msi.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index db9c1d7..b994012 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -193,11 +193,6 @@ static struct msi_desc* alloc_msi_entry(void)
return entry;
}
-static void attach_msi_entry(struct msi_desc *entry, int irq)
-{
- msi_desc[irq] = entry;
-}
-
static int create_msi_irq(void)
{
struct msi_desc *entry;@@ -502,7 +497,7 @@ static int msi_capability_init(struct pci_dev *dev)
}
dev->first_msi_irq = irq;
- attach_msi_entry(entry, irq);
+ msi_desc[irq] = entry;
/* Set MSI enabled bits */
enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
@@ -581,7 +576,7 @@ static int msix_capability_init(struct pci_dev *dev,
break;
}
- attach_msi_entry(entry, irq);
+ msi_desc[irq] = entry;
}
if (i != nvec) {
int avail = i - 1;--
1.4.4.1.g278f
This is a note to let you know that I've just added the patch titled
Subject: msi: Remove attach_msi_entry.
to my gregkh-2.6 tree. Its filename is
msi-remove-attach_msi_entry.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
From owner-linux-pci@atrey.karlin.mff.cuni.cz Wed Jan 31 22:00:56 2007
From: ebiederm@xmission.com (Eric W. Biederman)
Date: Sun, 28 Jan 2007 12:47:52 -0700
Subject: msi: Remove attach_msi_entry.
To: Greg Kroah-Hartman <redacted>
Cc: "David S. Miller" <davem@davemloft.net>, Kyle McMartin <redacted>, <redacted>, Brice Goglin <redacted>, <redacted>, Michael Ellerman <redacted>, Grant Grundler <redacted>, Tony Luck <tony.luck@intel.com>, Ingo Molnar <redacted>
Message-ID: [off-list ref]
The attach_msi_entry has been reduced to a single simple assignment,
so for simplicity remove the abstraction and directory perform the
assignment.
Signed-off-by: Eric W. Biederman <redacted>
Acked-by: Ingo Molnar <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/pci/msi.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
--- gregkh-2.6.orig/drivers/pci/msi.c
+++ gregkh-2.6/drivers/pci/msi.c
@@ -193,11 +193,6 @@ static struct msi_desc* alloc_msi_entry(
return entry;
}
-static void attach_msi_entry(struct msi_desc *entry, int irq)
-{
- msi_desc[irq] = entry;
-}
-
static int create_msi_irq(void)
{
struct msi_desc *entry;@@ -491,7 +486,7 @@ static int msi_capability_init(struct pc
}
dev->first_msi_irq = irq;
- attach_msi_entry(entry, irq);
+ msi_desc[irq] = entry;
/* Set MSI enabled bits */
enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
@@ -570,7 +565,7 @@ static int msix_capability_init(struct p
break;
}
- attach_msi_entry(entry, irq);
+ msi_desc[irq] = entry;
}
if (i != nvec) {
int avail = i - 1;
Patches currently in gregkh-2.6 which might be from greg@kroah.com are