summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/northbridge/via/cn400/agp.c2
-rw-r--r--src/northbridge/via/cn400/cn400.h7
-rw-r--r--src/northbridge/via/cn400/northbridge.c18
-rw-r--r--src/northbridge/via/cn400/vlink.c18
-rw-r--r--src/northbridge/via/cn700/agp.c4
-rw-r--r--src/northbridge/via/cn700/cn700.h7
-rw-r--r--src/northbridge/via/cn700/northbridge.c12
-rw-r--r--src/northbridge/via/cx700/agp.c6
-rw-r--r--src/northbridge/via/cx700/northbridge.c10
-rw-r--r--src/northbridge/via/vt8601/northbridge.c10
-rw-r--r--src/northbridge/via/vt8623/northbridge.c10
-rw-r--r--src/northbridge/via/vx800/northbridge.c12
-rw-r--r--src/northbridge/via/vx800/vx800.h7
-rw-r--r--src/northbridge/via/vx900/northbridge.c10
14 files changed, 40 insertions, 93 deletions
diff --git a/src/northbridge/via/cn400/agp.c b/src/northbridge/via/cn400/agp.c
index ce814c5f70..ece71e0e7d 100644
--- a/src/northbridge/via/cn400/agp.c
+++ b/src/northbridge/via/cn400/agp.c
@@ -128,7 +128,7 @@ static void agp_init(device_t dev)
}
static const struct device_operations agp_operations = {
- .read_resources = cn400_noop,
+ .read_resources = DEVICE_NOOP,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = agp_init,
diff --git a/src/northbridge/via/cn400/cn400.h b/src/northbridge/via/cn400/cn400.h
index 2df30a6013..4921bef3c9 100644
--- a/src/northbridge/via/cn400/cn400.h
+++ b/src/northbridge/via/cn400/cn400.h
@@ -18,13 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __PRE_RAM__
-// HACK
-static inline void cn400_noop(device_t dev)
-{
-}
-#endif
-
#define DEBUG_CN400
/* VGA stuff */
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index 149eab37f9..b797179047 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -127,10 +127,10 @@ static void memctrl_init(device_t dev)
}
static const struct device_operations memctrl_operations = {
- .read_resources = cn400_noop,
- .set_resources = cn400_noop,
- .enable_resources = cn400_noop,
- .init = memctrl_init,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
+ .init = memctrl_init,
.ops_pci = 0,
};
@@ -241,14 +241,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
diff --git a/src/northbridge/via/cn400/vlink.c b/src/northbridge/via/cn400/vlink.c
index c98982e07c..2319e75ac9 100644
--- a/src/northbridge/via/cn400/vlink.c
+++ b/src/northbridge/via/cn400/vlink.c
@@ -158,9 +158,9 @@ static void c3_host_init(device_t dev)
}
static const struct device_operations c3_host_operations = {
- .read_resources = cn400_noop,
- .set_resources = cn400_noop,
- .enable_resources = cn400_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = c3_host_init,
.ops_pci = 0,
};
@@ -195,9 +195,9 @@ static void c3_err_init(device_t dev)
}
static const struct device_operations c3_err_operations = {
- .read_resources = cn400_noop,
- .set_resources = cn400_noop,
- .enable_resources = cn400_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = c3_err_init,
.ops_pci = 0,
};
@@ -231,9 +231,9 @@ static void cn400_pm_init(device_t dev)
}
static const struct device_operations cn400_pm_operations = {
- .read_resources = cn400_noop,
- .set_resources = cn400_noop,
- .enable_resources = cn400_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cn400_pm_init,
.ops_pci = 0,
};
diff --git a/src/northbridge/via/cn700/agp.c b/src/northbridge/via/cn700/agp.c
index e5a0fd0905..fce61b484a 100644
--- a/src/northbridge/via/cn700/agp.c
+++ b/src/northbridge/via/cn700/agp.c
@@ -104,7 +104,7 @@ static void agp_init(device_t dev)
}
static const struct device_operations agp_operations = {
- .read_resources = cn700_noop,
+ .read_resources = DEVICE_NOOP,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = agp_init,
@@ -157,7 +157,7 @@ static void agp_bridge_init(device_t dev)
}
static const struct device_operations agp_bridge_operations = {
- .read_resources = cn700_noop,
+ .read_resources = DEVICE_NOOP,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_bus_enable_resources,
.init = agp_bridge_init,
diff --git a/src/northbridge/via/cn700/cn700.h b/src/northbridge/via/cn700/cn700.h
index ff1d4b3ce3..3cbc3ddb98 100644
--- a/src/northbridge/via/cn700/cn700.h
+++ b/src/northbridge/via/cn700/cn700.h
@@ -18,13 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#if !defined (__PRE_RAM__)
-// HACK
-static inline void cn700_noop(device_t dev)
-{
-}
-#endif
-
/* VGA stuff */
#define SR_INDEX 0x3c4
#define SR_DATA 0x3c5
diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index a326baf2b2..506bdd1b59 100644
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -87,7 +87,7 @@ static void memctrl_init(device_t dev)
}
static const struct device_operations memctrl_operations = {
- .read_resources = cn700_noop,
+ .read_resources = DEVICE_NOOP,
.init = memctrl_init,
};
@@ -161,14 +161,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
diff --git a/src/northbridge/via/cx700/agp.c b/src/northbridge/via/cx700/agp.c
index f80d7d1bb0..06475cc3ff 100644
--- a/src/northbridge/via/cx700/agp.c
+++ b/src/northbridge/via/cx700/agp.c
@@ -72,12 +72,8 @@ static void agp_bridge_init(device_t dev)
pci_write_config8(dev, 0x44, 0x34);
}
-static void cx700_noop(device_t dev)
-{
-}
-
static struct device_operations agp_bridge_operations = {
- .read_resources = cx700_noop,
+ .read_resources = DEVICE_NOOP,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_bus_enable_resources,
.init = agp_bridge_init,
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index e3314fff8e..cc9dabd27a 100644
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -117,14 +117,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index bed434da2f..188749130f 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -107,14 +107,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index 6e0f4ea802..546db4cb61 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -167,14 +167,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 214ca8bc4b..fad0c2f926 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -61,7 +61,7 @@ static void memctrl_init(device_t dev)
}
static const struct device_operations memctrl_operations = {
- .read_resources = vx800_noop,
+ .read_resources = DEVICE_NOOP,
.init = memctrl_init,
};
@@ -150,14 +150,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
diff --git a/src/northbridge/via/vx800/vx800.h b/src/northbridge/via/vx800/vx800.h
index adfe27209a..ae944efcb1 100644
--- a/src/northbridge/via/vx800/vx800.h
+++ b/src/northbridge/via/vx800/vx800.h
@@ -20,13 +20,6 @@
#ifndef VX800_H
#define VX800_H 1
-#ifndef __PRE_RAM__
-#include <device/device.h>
-static inline void vx800_noop(device_t dev)
-{
-}
-#endif
-
#ifdef __PRE_RAM__
/* vx800_early_smbus.c */
struct mem_controller;
diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c
index 53cada32d3..f9c225d637 100644
--- a/src/northbridge/via/vx900/northbridge.c
+++ b/src/northbridge/via/vx900/northbridge.c
@@ -322,14 +322,10 @@ static void cpu_bus_init(device_t dev)
initialize_cpus(dev->link_list);
}
-static void cpu_bus_noop(device_t dev)
-{
-}
-
static struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
+ .read_resources = DEVICE_NOOP,
+ .set_resources = DEVICE_NOOP,
+ .enable_resources = DEVICE_NOOP,
.init = cpu_bus_init,
.scan_bus = 0,
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:59:22 +0000