[PATCH 2/2] x86-64: Calgary - get rid of translate_phb

[Muli Ben-Yehuda]

Now that we check for translation enabled/disabled based on the
presence of the IOMMU translation table, we can get rid of
translate_phb.

Signed-off-by: Muli Ben-Yehuda <[EMAIL PROTECTED]>
---
 pci-calgary.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff -r c9308d0538d9 -r a7833c71f4df arch/x86_64/kernel/pci-calgary.c
--- a/arch/x86_64/kernel/pci-calgary.c  Sun Aug 12 11:43:49 2007 +0300
+++ b/arch/x86_64/kernel/pci-calgary.c  Sun Aug 12 11:45:29 2007 +0300
@@ -226,12 +226,6 @@ static inline int translation_enabled(st
        return (tbl != NULL);
 }
 
-static inline int translate_phb(struct pci_dev* dev)
-{
-       int disabled = bus_info[dev->bus->number].translation_disabled;
-       return !disabled;
-}
-
 static void iommu_range_reserve(struct iommu_table *tbl,
        unsigned long start_addr, unsigned int npages)
 {
@@ -1197,7 +1191,7 @@ static int __init calgary_init(void)
 {
        int ret;
        struct pci_dev *dev = NULL;
-       void *tce_space;
+       struct calgary_bus_info *info;
 
        ret = calgary_locate_bbars();
        if (ret)
@@ -1209,12 +1203,14 @@ static int __init calgary_init(void)
                        break;
                if (!is_cal_pci_dev(dev->device))
                        continue;
-               if (!translate_phb(dev)) {
+
+               info = &bus_info[dev->bus->number];
+               if (info->translation_disabled) {
                        calgary_init_one_nontraslated(dev);
                        continue;
                }
-               tce_space = bus_info[dev->bus->number].tce_space;
-               if (!tce_space && !translate_empty_slots)
+
+               if (!info->tce_space && !translate_empty_slots)
                        continue;
 
                ret = calgary_init_one(dev);
@@ -1232,11 +1228,13 @@ error:
                        break;
                if (!is_cal_pci_dev(dev->device))
                        continue;
-               if (!translate_phb(dev)) {
+
+               info = &bus_info[dev->bus->number];
+               if (info->translation_disabled) {
                        pci_dev_put(dev);
                        continue;
                }
-               if (!bus_info[dev->bus->number].tce_space && 
!translate_empty_slots)
+               if (!info->tce_space && !translate_empty_slots)
                        continue;
 
                calgary_disable_translation(dev);
@@ -1549,7 +1547,7 @@ static int __init calgary_fixup_tce_spac
 static int __init calgary_fixup_tce_spaces(void)
 {
        struct pci_dev *dev = NULL;
-       void *tce_space;
+       struct calgary_bus_info *info;
 
        if (no_iommu || swiotlb || !calgary_detected)
                return -ENODEV;
@@ -1562,11 +1560,12 @@ static int __init calgary_fixup_tce_spac
                        break;
                if (!is_cal_pci_dev(dev->device))
                        continue;
-               if (!translate_phb(dev))
+
+               info = &bus_info[dev->bus->number];
+               if (info->translation_disabled)
                        continue;
 
-               tce_space = bus_info[dev->bus->number].tce_space;
-               if (!tce_space)
+               if (!info->tce_space)
                        continue;
 
                calgary_fixup_one_tce_space(dev);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/