PCI: cleanup MSI code

Cleanup MSI code as follows:

 - fix some types
 - fix strange local variable definition
 - delete unnecessary blank line
 - add comment to #endif which is far from corresponding #ifdef

Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index ed3f7e1a563c79c06d9808bfc59c795665fc11c5..e87e8efb9bb4ac5527167f91c662744d8614ce25 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -49,8 +49,8 @@ static void msi_set_mask_bit(unsigned int irq, int flag)
        switch (entry->msi_attrib.type) {
        case PCI_CAP_ID_MSI:
                if (entry->msi_attrib.maskbit) {
-                       int             pos;
-                       u32             mask_bits;
+                       int pos;
+                       u32 mask_bits;
 
                        pos = (long)entry->mask_base;
                        pci_read_config_dword(entry->dev, pos, &mask_bits);
@@ -162,6 +162,7 @@ void unmask_msi_irq(unsigned int irq)
 }
 
 static int msi_free_irq(struct pci_dev* dev, int irq);
+
 static int msi_init(void)
 {
        static int status = -ENOMEM;
@@ -291,7 +292,7 @@ static int msi_lookup_irq(struct pci_dev *dev, int type)
                        continue;
                spin_unlock_irqrestore(&msi_lock, flags);
                /* This pre-assigned MSI irq for this device
-                  already exits. Override dev->irq with this irq */
+                  already exists. Override dev->irq with this irq */
                dev->irq = irq;
                return 0;
        }
@@ -458,7 +459,7 @@ void pci_restore_msix_state(struct pci_dev *dev)
        pci_write_config_word(dev, msi_control_reg(pos), save);
        enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
 }
-#endif
+#endif /* CONFIG_PM */
 
 /**
  * msi_capability_init - configure device's MSI capability structure

diff --git a/include/linux/msi.h b/include/linux/msi.h
index c7ef94343673f00fabb41c093e5d7404cb71197a..b99976b1536ef8c7981bd5097f244c969f9bcf2e 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -7,11 +7,10 @@ struct msi_msg {
        u32     data;           /* 16 bits of msi message data */
 };
 
-/* Heper functions */
+/* Helper functions */
 extern void mask_msi_irq(unsigned int irq);
 extern void unmask_msi_irq(unsigned int irq);
 extern void read_msi_msg(unsigned int irq, struct msi_msg *msg);
-
 extern void write_msi_msg(unsigned int irq, struct msi_msg *msg);
 
 struct msi_desc {