[PATCH 34/42] DRVMGR: renamed info_dev to get_info_dev

[Daniel Hellstrom]

---
 c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c |    2 +-
 cpukit/libdrvmgr/drvmgr.h                         |    3 ++-
 cpukit/libdrvmgr/drvmgr_print.c                   |    6 +++---
 cpukit/libpci/pci_bus.c                           |    2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c 
b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c
index 63b605a..922c43b 100644
--- a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c
+++ b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c
@@ -73,7 +73,7 @@ struct drvmgr_bus_ops ambapp_bus_ops =
        .get_params     = ambapp_get_params,
        .get_freq       = ambapp_bus_freq_get,
 #ifdef AMBAPPBUS_INFO_AVAIL
-       .info_dev       = ambapp_dev_info,
+       .get_info_dev   = ambapp_dev_info,
 #endif
 };
 
diff --git a/cpukit/libdrvmgr/drvmgr.h b/cpukit/libdrvmgr/drvmgr.h
index 6780efe..71a2850 100644
--- a/cpukit/libdrvmgr/drvmgr.h
+++ b/cpukit/libdrvmgr/drvmgr.h
@@ -145,7 +145,8 @@ struct drvmgr_bus_ops {
        /*! Function called to request information about a device. The bus
         *  driver interpret the bus-specific information about the device.
         */
-       void    (*info_dev)(struct drvmgr_dev *, void (*print)(void *p, char 
*str), void *p);
+       void    (*get_info_dev)(struct drvmgr_dev *,
+                               void (*print)(void *p, char *str), void *p);
 };
 #define BUS_OPS_NUM (sizeof(struct drvmgr_bus_ops)/sizeof(void (*)(void)))
 
diff --git a/cpukit/libdrvmgr/drvmgr_print.c b/cpukit/libdrvmgr/drvmgr_print.c
index 206b9fe..9330867 100644
--- a/cpukit/libdrvmgr/drvmgr_print.c
+++ b/cpukit/libdrvmgr/drvmgr_print.c
@@ -261,10 +261,10 @@ void drvmgr_info_dev(struct drvmgr_dev *dev, unsigned int 
options)
                printf("  --- DEVICE INFO FROM BUS DRIVER ---\n");
                if (!dev->parent)
                        printf("  !! device has no parent bus !!\n");
-               else if (dev->parent->ops->info_dev)
-                       dev->parent->ops->info_dev(dev, print_info, NULL);
+               else if (dev->parent->ops->get_info_dev)
+                       dev->parent->ops->get_info_dev(dev, print_info, NULL);
                else
-                       printf("  Bus doesn't implement info_dev func\n");
+                       printf("  Bus doesn't implement get_info_dev func\n");
        }
 
        if (options & OPTION_DEV_DRVINFO) {
diff --git a/cpukit/libpci/pci_bus.c b/cpukit/libpci/pci_bus.c
index 0e917c0..7c2f18b 100644
--- a/cpukit/libpci/pci_bus.c
+++ b/cpukit/libpci/pci_bus.c
@@ -94,7 +94,7 @@ struct drvmgr_bus_ops pcibus_ops = {
        .get_params     = pcibus_get_params,
        .get_freq       = pcibus_get_freq,
 #ifdef PCIBUS_INFO
-       .info_dev       = pcibus_dev_info,
+       .get_info_dev   = pcibus_dev_info,
 #endif
 };
 
-- 
1.7.0.4

_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel