Author: uwe
Date: 2007-11-15 16:52:42 +0100 (Thu, 15 Nov 2007)
New Revision: 2974
Modified:
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_ctrl.c
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_dram.c
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_error.c
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host.c
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host_ctrl.c
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_pcie.c
trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_traf_ctrl.c
trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r.c
trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_bridge.c
trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_ide.c
trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_lpc.c
trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_sata.c
Log:
Various cosmetic fixes and improvements (trivial).
- Use 'static' where appropriate.
- Use 'const' where appropriate.
- Indentation fixes.
- Add comment wrt init code which is only valid for VT8237R.
Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]>
Acked-by: Uwe Hermann <[EMAIL PROTECTED]>
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_ctrl.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_ctrl.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_ctrl.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -41,12 +41,17 @@
* V-Link CKG Control 0xb0 0x05 0x05 0x06 0x03
* V-Link CKG Control 0xb1 0x05 0x05 0x01 0x03
*/
-static void ctrl_init(struct device *dev)
+static void ctrl_init_vt8237r(struct device *dev)
{
u8 reg;
+
+ /*
+ * This init code is valid only for the VT8237R! For different
+ * sounthbridges (e.g. VT8237A, VT8237S, VT8237 (without plus R)
+ * and VT8251) a different init code is required.
+ */
device_t devsb = dev_find_device(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_VT8237R_LPC, 0);
-
if (!devsb)
return;
@@ -132,17 +137,17 @@
pci_write_config8(dev, 0x63, regm3 | (regm & 0x3F));
}
-static struct device_operations ctrl_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .enable = ctrl_enable,
- .init = ctrl_init,
- .ops_pci = 0,
+static const struct device_operations ctrl_ops = {
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .enable = ctrl_enable,
+ .init = ctrl_init_vt8237r,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &ctrl_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_7,
+ .ops = &ctrl_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_7,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_dram.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_dram.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_dram.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -19,7 +19,6 @@
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
@@ -63,16 +62,16 @@
pci_write_config16(dev, 0x88, (msr.lo >> 24) | reg);
}
-static struct device_operations dram_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .enable = dram_enable,
- .ops_pci = 0,
+static const struct device_operations dram_ops = {
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .enable = dram_enable,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &dram_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_3,
+ .ops = &dram_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_3,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_error.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_error.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_error.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -33,15 +33,15 @@
}
static const struct device_operations error_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .enable = error_enable,
- .ops_pci = 0,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .enable = error_enable,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &error_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_1,
+ .ops = &error_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_1,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -30,16 +30,16 @@
pci_write_config8(dev, K8T890_MULTIPLE_FN_EN, 0x01);
}
-static struct device_operations host_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .enable = host_enable,
- .ops_pci = 0,
+static const struct device_operations host_ops = {
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .enable = host_enable,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &host_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_0,
+ .ops = &host_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_0,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host_ctrl.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host_ctrl.c
2007-11-14 17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_host_ctrl.c
2007-11-15 15:52:42 UTC (rev 2974)
@@ -78,16 +78,16 @@
dump_south(dev);
}
-static struct device_operations host_ctrl_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .enable = host_ctrl_enable,
- .ops_pci = 0,
+static const struct device_operations host_ctrl_ops = {
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .enable = host_ctrl_enable,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &host_ctrl_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_2,
+ .ops = &host_ctrl_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_2,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_pcie.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_pcie.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_pcie.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -21,10 +21,9 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pciexp.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
-void peg_init(struct device *dev)
+static void peg_init(struct device *dev)
{
u8 reg;
@@ -78,7 +77,7 @@
dump_south(dev);
}
-void pcie_init(struct device *dev)
+static void pcie_init(struct device *dev)
{
u8 reg;
@@ -113,52 +112,52 @@
dump_south(dev);
}
-static struct device_operations peg_ops = {
- .read_resources = pci_bus_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_bus_enable_resources,
- .enable = peg_init,
- .scan_bus = pciexp_scan_bridge,
- .reset_bus = pci_bus_reset,
- .ops_pci = 0,
+static const struct device_operations peg_ops = {
+ .read_resources = pci_bus_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_bus_enable_resources,
+ .enable = peg_init,
+ .scan_bus = pciexp_scan_bridge,
+ .reset_bus = pci_bus_reset,
+ .ops_pci = 0,
};
-static struct device_operations pcie_ops = {
- .read_resources = pci_bus_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_bus_enable_resources,
- .enable = pcie_init,
- .scan_bus = pciexp_scan_bridge,
- .reset_bus = pci_bus_reset,
- .ops_pci = 0,
+static const struct device_operations pcie_ops = {
+ .read_resources = pci_bus_read_resources,
+ .set_resources = pci_dev_set_resources,
+ .enable_resources = pci_bus_enable_resources,
+ .enable = pcie_init,
+ .scan_bus = pciexp_scan_bridge,
+ .reset_bus = pci_bus_reset,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &peg_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_PEG,
+ .ops = &peg_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_PEG,
};
static const struct pci_driver pcie_drvd3f0 __pci_driver = {
- .ops = &pcie_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX0,
+ .ops = &pcie_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX0,
};
static const struct pci_driver pcie_drvd3f1 __pci_driver = {
- .ops = &pcie_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX1,
+ .ops = &pcie_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX1,
};
static const struct pci_driver pcie_drvd3f2 __pci_driver = {
- .ops = &pcie_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX2,
+ .ops = &pcie_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX2,
};
static const struct pci_driver pcie_drvd3f3 __pci_driver = {
- .ops = &pcie_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX3,
+ .ops = &pcie_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_PEX3,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_traf_ctrl.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_traf_ctrl.c
2007-11-14 17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/k8t890/k8t890_traf_ctrl.c
2007-11-15 15:52:42 UTC (rev 2974)
@@ -19,13 +19,11 @@
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <console/console.h>
-
#include "k8t890.h"
-void mmconfig_set_resources(device_t dev)
+static void mmconfig_set_resources(device_t dev)
{
struct resource *resource;
u8 reg;
@@ -106,16 +104,16 @@
apic[4] = (data & 0xF0FFFF) | (K8T890_APIC_ID << 24);
}
-static struct device_operations traf_ctrl_ops = {
- .read_resources = apic_mmconfig_read_resources,
- .set_resources = mmconfig_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .enable = traf_ctrl_enable,
- .ops_pci = 0,
+static const struct device_operations traf_ctrl_ops = {
+ .read_resources = apic_mmconfig_read_resources,
+ .set_resources = mmconfig_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .enable = traf_ctrl_enable,
+ .ops_pci = 0,
};
static const struct pci_driver northbridge_driver __pci_driver = {
- .ops = &traf_ctrl_ops,
- .vendor = PCI_VENDOR_ID_VIA,
- .device = PCI_DEVICE_ID_VIA_K8T890CE_5,
+ .ops = &traf_ctrl_ops,
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_DEVICE_ID_VIA_K8T890CE_5,
};
Modified: trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -20,7 +20,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <pc80/keyboard.h>
#include "chip.h"
Modified: trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_bridge.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_bridge.c
2007-11-14 17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_bridge.c
2007-11-15 15:52:42 UTC (rev 2974)
@@ -19,7 +19,6 @@
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <console/console.h>
Modified: trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_ide.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_ide.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_ide.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -21,7 +21,6 @@
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <console/console.h>
#include "vt8237r.h"
Modified: trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_lpc.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_lpc.c 2007-11-14
17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_lpc.c 2007-11-15
15:52:42 UTC (rev 2974)
@@ -23,7 +23,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <pc80/mc146818rtc.h>
#include <cpu/x86/lapic.h>
@@ -48,7 +47,7 @@
extern void dump_south(device_t dev);
-struct ioapicreg {
+static struct ioapicreg {
u32 reg;
u32 value_low;
u32 value_high;
@@ -146,7 +145,7 @@
* Set up the power management capabilities directly into ACPI mode.
* This avoids having to handle any System Management Interrupts (SMIs).
*/
-void setup_pm(device_t dev)
+static void setup_pm(device_t dev)
{
/* Debounce LID and PWRBTN# Inputs for 16ms. */
pci_write_config8(dev, 0x80, 0x20);
@@ -299,7 +298,7 @@
rtc_init(0);
}
-void vt8237r_read_resources(device_t dev)
+static void vt8237r_read_resources(device_t dev)
{
struct resource *res;
@@ -320,7 +319,7 @@
* than standard PC I/O addresses), however it does control the ISA bus
* and so we need to manually call enable childrens resources on that bus.
*/
-void vt8237r_enable_resources(device_t dev)
+static void vt8237r_enable_resources(device_t dev)
{
pci_dev_enable_resources(dev);
enable_childrens_resources(dev);
Modified: trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_sata.c
===================================================================
--- trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_sata.c
2007-11-14 17:57:04 UTC (rev 2973)
+++ trunk/LinuxBIOSv2/src/southbridge/via/vt8237r/vt8237r_sata.c
2007-11-15 15:52:42 UTC (rev 2974)
@@ -20,7 +20,6 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <device/pci_ops.h>
#include <device/pci_ids.h>
#define SATA_MISC_CTRL 0x45
--
linuxbios mailing list
[email protected]
http://www.linuxbios.org/mailman/listinfo/linuxbios
