[coreboot-gerrit] New patch to review for coreboot: bf23a66 nvidia/ck804: Minor cleanup on dead code
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Wed Feb 4 09:12:29 CET 2015
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8340
-gerrit
commit bf23a66f7af056786b89d6b0afc052cc05599301
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Feb 3 08:43:51 2015 +0200
nvidia/ck804: Minor cleanup on dead code
Change-Id: I07f4190ab73ec3468e3738be14d64468e2a05720
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/southbridge/nvidia/ck804/ac97.c | 2 --
src/southbridge/nvidia/ck804/early_setup.c | 2 --
src/southbridge/nvidia/ck804/early_setup_car.c | 2 --
src/southbridge/nvidia/ck804/ide.c | 1 -
src/southbridge/nvidia/ck804/lpc.c | 17 -----------------
src/southbridge/nvidia/ck804/nic.c | 1 -
src/southbridge/nvidia/ck804/pci.c | 1 -
src/southbridge/nvidia/ck804/pcie.c | 1 -
src/southbridge/nvidia/ck804/sata.c | 1 -
src/southbridge/nvidia/ck804/smbus.c | 1 -
src/southbridge/nvidia/ck804/usb.c | 1 -
src/southbridge/nvidia/ck804/usb2.c | 1 -
12 files changed, 31 deletions(-)
diff --git a/src/southbridge/nvidia/ck804/ac97.c b/src/southbridge/nvidia/ck804/ac97.c
index f7feb4e..764f46b 100644
--- a/src/southbridge/nvidia/ck804/ac97.c
+++ b/src/southbridge/nvidia/ck804/ac97.c
@@ -29,7 +29,6 @@ static struct device_operations ac97audio_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- // .enable = ck804_enable,
.init = 0,
.scan_bus = 0,
.ops_pci = &ck804_pci_ops,
@@ -45,7 +44,6 @@ static struct device_operations ac97modem_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- // .enable = ck804_enable,
.init = 0,
.scan_bus = 0,
.ops_pci = &ck804_pci_ops,
diff --git a/src/southbridge/nvidia/ck804/early_setup.c b/src/southbridge/nvidia/ck804/early_setup.c
index b93c07c..ea25115 100644
--- a/src/southbridge/nvidia/ck804/early_setup.c
+++ b/src/southbridge/nvidia/ck804/early_setup.c
@@ -67,8 +67,6 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
* 16 4 :4
*/
-#define CK804_CHIP_REV 3
-
static void ck804_early_set_port(void)
{
static const unsigned int ctrl_devport_conf[] = {
diff --git a/src/southbridge/nvidia/ck804/early_setup_car.c b/src/southbridge/nvidia/ck804/early_setup_car.c
index 2df3434..78b89de 100644
--- a/src/southbridge/nvidia/ck804/early_setup_car.c
+++ b/src/southbridge/nvidia/ck804/early_setup_car.c
@@ -73,8 +73,6 @@ static void setup_ss_table(unsigned index, unsigned where, unsigned control,
* 16 4 :4
*/
-#define CK804_CHIP_REV 3
-
static void ck804_early_set_port(unsigned ck804_num, unsigned *busn,
unsigned *io_base)
{
diff --git a/src/southbridge/nvidia/ck804/ide.c b/src/southbridge/nvidia/ck804/ide.c
index e9791a5..5837f52 100644
--- a/src/southbridge/nvidia/ck804/ide.c
+++ b/src/southbridge/nvidia/ck804/ide.c
@@ -67,7 +67,6 @@ static struct device_operations ide_ops = {
.enable_resources = pci_dev_enable_resources,
.init = ide_init,
.scan_bus = 0,
- // .enable = ck804_enable,
.ops_pci = &ck804_pci_ops,
};
diff --git a/src/southbridge/nvidia/ck804/lpc.c b/src/southbridge/nvidia/ck804/lpc.c
index 1b3fd89..276234f 100644
--- a/src/southbridge/nvidia/ck804/lpc.c
+++ b/src/southbridge/nvidia/ck804/lpc.c
@@ -38,8 +38,6 @@
#include <cpu/amd/powernow.h>
#include "chip.h"
-#define CK804_CHIP_REV 2
-
#define NMI_OFF 0
// Power restoration control register is at 0x7a
@@ -119,11 +117,6 @@ static void lpc_init(device_t dev)
pm_base = pci_read_config32(dev, 0x60) & 0xff00;
printk(BIOS_INFO, "%s: pm_base = %x \n", __func__, pm_base);
-#if CK804_CHIP_REV == 1
- if (dev->bus->secondary != 1)
- return;
-#endif
-
/* Power after power fail */
on = CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL;
get_option(&on, "power_on_after_fail");
@@ -337,7 +330,6 @@ static struct device_operations lpc_ops = {
#endif
.init = lpc_init,
.scan_bus = scan_static_bus,
- // .enable = ck804_enable,
.ops_pci = &ck804_pci_ops,
};
@@ -353,13 +345,6 @@ static const struct pci_driver lpc_driver_pro __pci_driver = {
.device = PCI_DEVICE_ID_NVIDIA_CK804_PRO,
};
-#if CK804_CHIP_REV == 1
-static const struct pci_driver lpc_driver_slave __pci_driver = {
- .ops = &lpc_ops,
- .vendor = PCI_VENDOR_ID_NVIDIA,
- .device = PCI_DEVICE_ID_NVIDIA_CK804_SLAVE,
-};
-#else
static struct device_operations lpc_slave_ops = {
.read_resources = ck804_lpc_read_resources,
.set_resources = pci_dev_set_resources,
@@ -368,7 +353,6 @@ static struct device_operations lpc_slave_ops = {
.write_acpi_tables = acpi_write_hpet,
#endif
.init = lpc_slave_init,
- // .enable = ck804_enable,
.ops_pci = &ck804_pci_ops,
};
@@ -377,4 +361,3 @@ static const struct pci_driver lpc_driver_slave __pci_driver = {
.vendor = PCI_VENDOR_ID_NVIDIA,
.device = PCI_DEVICE_ID_NVIDIA_CK804_SLAVE,
};
-#endif
diff --git a/src/southbridge/nvidia/ck804/nic.c b/src/southbridge/nvidia/ck804/nic.c
index 6f5a64e..70d1c1e 100644
--- a/src/southbridge/nvidia/ck804/nic.c
+++ b/src/southbridge/nvidia/ck804/nic.c
@@ -115,7 +115,6 @@ static struct device_operations nic_ops = {
.enable_resources = pci_dev_enable_resources,
.init = nic_init,
.scan_bus = 0,
- // .enable = ck804_enable,
.ops_pci = &ck804_pci_ops,
};
diff --git a/src/southbridge/nvidia/ck804/pci.c b/src/southbridge/nvidia/ck804/pci.c
index 94cfdb1..627949d 100644
--- a/src/southbridge/nvidia/ck804/pci.c
+++ b/src/southbridge/nvidia/ck804/pci.c
@@ -84,7 +84,6 @@ static struct device_operations pci_ops = {
.enable_resources = pci_bus_enable_resources,
.init = pci_init,
.scan_bus = pci_scan_bridge,
- // .enable = ck804_enable,
};
static const struct pci_driver pci_driver __pci_driver = {
diff --git a/src/southbridge/nvidia/ck804/pcie.c b/src/southbridge/nvidia/ck804/pcie.c
index ef7707a..1110a99 100644
--- a/src/southbridge/nvidia/ck804/pcie.c
+++ b/src/southbridge/nvidia/ck804/pcie.c
@@ -42,7 +42,6 @@ static struct device_operations pcie_ops = {
.enable_resources = pci_bus_enable_resources,
.init = pcie_init,
.scan_bus = pci_scan_bridge,
- // .enable = ck804_enable,
};
static const struct pci_driver pcie_driver __pci_driver = {
diff --git a/src/southbridge/nvidia/ck804/sata.c b/src/southbridge/nvidia/ck804/sata.c
index 8943520..f435956 100644
--- a/src/southbridge/nvidia/ck804/sata.c
+++ b/src/southbridge/nvidia/ck804/sata.c
@@ -167,7 +167,6 @@ static struct device_operations sata_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- // .enable = ck804_enable,
.init = sata_init,
.scan_bus = 0,
.ops_pci = &ck804_pci_ops,
diff --git a/src/southbridge/nvidia/ck804/smbus.c b/src/southbridge/nvidia/ck804/smbus.c
index ac0f9e5..270d085 100644
--- a/src/southbridge/nvidia/ck804/smbus.c
+++ b/src/southbridge/nvidia/ck804/smbus.c
@@ -97,7 +97,6 @@ static struct device_operations smbus_ops = {
.enable_resources = pci_dev_enable_resources,
.init = 0,
.scan_bus = scan_static_bus,
- // .enable = ck804_enable,
.ops_pci = &ck804_pci_ops,
.ops_smbus_bus = &lops_smbus_bus,
};
diff --git a/src/southbridge/nvidia/ck804/usb.c b/src/southbridge/nvidia/ck804/usb.c
index ed67c33..9f802cd 100644
--- a/src/southbridge/nvidia/ck804/usb.c
+++ b/src/southbridge/nvidia/ck804/usb.c
@@ -51,7 +51,6 @@ static struct device_operations usb_ops = {
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = usb1_init,
- // .enable = ck804_enable,
.scan_bus = 0,
.ops_pci = &ck804_pci_ops,
};
diff --git a/src/southbridge/nvidia/ck804/usb2.c b/src/southbridge/nvidia/ck804/usb2.c
index 0597aac..92ee5fa 100644
--- a/src/southbridge/nvidia/ck804/usb2.c
+++ b/src/southbridge/nvidia/ck804/usb2.c
@@ -39,7 +39,6 @@ static struct device_operations usb2_ops = {
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = usb2_init,
- // .enable = ck804_enable,
.scan_bus = 0,
.ops_pci = &ck804_pci_ops,
};
More information about the coreboot-gerrit
mailing list