Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b7b095c154c50ee753832bbf78e8690c492fc8f6
Commit:     b7b095c154c50ee753832bbf78e8690c492fc8f6
Parent:     579082df38839efc5b14aa3f48b8806e3e8dc5c2
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 9 11:55:50 2007 -0700
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Jul 11 16:02:11 2007 -0700

    PCI: pci-x-pci-express-read-control-interfaces cleanups
    
    - remove unneeded local
    
    - 80-col fix
    
    Cc: Peter Oruba <[EMAIL PROTECTED]>
    Cc: Roland Dreier <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/pci/pci.c    |    6 ++----
 drivers/pci/quirks.c |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 1bb8799..d9fc1bd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1383,7 +1383,7 @@ pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
  */
 int pcix_get_max_mmrbc(struct pci_dev *dev)
 {
-       int ret, err, cap;
+       int err, cap;
        u32 stat;
 
        cap = pci_find_capability(dev, PCI_CAP_ID_PCIX);
@@ -1394,9 +1394,7 @@ int pcix_get_max_mmrbc(struct pci_dev *dev)
        if (err)
                return -EINVAL;
 
-       ret = (stat & PCI_X_STATUS_MAX_READ) >> 12;
-
-       return ret;
+       return (stat & PCI_X_STATUS_MAX_READ) >> 12;
 }
 EXPORT_SYMBOL(pcix_get_max_mmrbc);
 
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f75ade6..c559085 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -633,8 +633,8 @@ static void __init quirk_amd_8131_mmrbc(struct pci_dev *dev)
 
        pci_read_config_byte(dev, PCI_REVISION_ID, &revid);
        if (dev->subordinate && revid <= 0x12) {
-               printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X 
MMRBC\n",
-                       revid);
+               printk(KERN_INFO "AMD8131 rev %x detected, disabling PCI-X "
+                               "MMRBC\n", revid);
                dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC;
        }
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to