[PATCH 33/42] DRVMGR: change name of freq_get to get_freq
Daniel Hellstrom
daniel at gaisler.com
Tue Apr 14 11:33:00 UTC 2015
---
c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c | 2 +-
cpukit/libdrvmgr/drvmgr.h | 2 +-
cpukit/libdrvmgr/drvmgr_drvinf.c | 4 ++--
cpukit/libpci/pci_bus.c | 6 +++---
4 files changed, 7 insertions(+), 7 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 4c58b2b..63b605a 100644
--- a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c
+++ b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus.c
@@ -71,7 +71,7 @@ struct drvmgr_bus_ops ambapp_bus_ops =
.int_mask = ambapp_int_mask,
.int_unmask = ambapp_int_unmask,
.get_params = ambapp_get_params,
- .freq_get = ambapp_bus_freq_get,
+ .get_freq = ambapp_bus_freq_get,
#ifdef AMBAPPBUS_INFO_AVAIL
.info_dev = ambapp_dev_info,
#endif
diff --git a/cpukit/libdrvmgr/drvmgr.h b/cpukit/libdrvmgr/drvmgr.h
index a084245..6780efe 100644
--- a/cpukit/libdrvmgr/drvmgr.h
+++ b/cpukit/libdrvmgr/drvmgr.h
@@ -141,7 +141,7 @@ struct drvmgr_bus_ops {
/* Get Parameters */
int (*get_params)(struct drvmgr_dev *, struct drvmgr_bus_params *);
/* Get Frequency of Bus */
- int (*freq_get)(struct drvmgr_dev*, int, unsigned int*);
+ int (*get_freq)(struct drvmgr_dev*, int, unsigned int*);
/*! Function called to request information about a device. The bus
* driver interpret the bus-specific information about the device.
*/
diff --git a/cpukit/libdrvmgr/drvmgr_drvinf.c b/cpukit/libdrvmgr/drvmgr_drvinf.c
index 45926f1..e0cd50d 100644
--- a/cpukit/libdrvmgr/drvmgr_drvinf.c
+++ b/cpukit/libdrvmgr/drvmgr_drvinf.c
@@ -54,10 +54,10 @@ int drvmgr_freq_get(
int options,
unsigned int *freq_hz)
{
- if (!dev || !dev->parent || !dev->parent->ops->freq_get)
+ if (!dev || !dev->parent || !dev->parent->ops->get_freq)
return -1;
- return dev->parent->ops->freq_get(dev, options, freq_hz);
+ return dev->parent->ops->get_freq(dev, options, freq_hz);
}
/* Get driver prefix */
diff --git a/cpukit/libpci/pci_bus.c b/cpukit/libpci/pci_bus.c
index 3cc840d..0e917c0 100644
--- a/cpukit/libpci/pci_bus.c
+++ b/cpukit/libpci/pci_bus.c
@@ -61,7 +61,7 @@ int pcibus_int_unregister(
int pcibus_int_clear(
struct drvmgr_dev *dev,
int index);
-int pcibus_freq_get(
+static int pcibus_get_freq(
struct drvmgr_dev *dev,
int options,
unsigned int *freq_hz);
@@ -92,7 +92,7 @@ struct drvmgr_bus_ops pcibus_ops = {
.int_mask = NULL,
.int_unmask = NULL,
.get_params = pcibus_get_params,
- .freq_get = pcibus_freq_get,
+ .get_freq = pcibus_get_freq,
#ifdef PCIBUS_INFO
.info_dev = pcibus_dev_info,
#endif
@@ -255,7 +255,7 @@ int pcibus_int_clear(
return 0;
}
-int pcibus_freq_get(
+static int pcibus_get_freq(
struct drvmgr_dev *dev,
int options,
unsigned int *freq_hz)
--
1.7.0.4
More information about the devel
mailing list