From b4fa3fd2aedc2d02c973c664a218e5551b4118a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 3 Feb 2015 08:43:51 +0200 Subject: [PATCH] nvidia/ck804: Minor cleanup on dead code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I07f4190ab73ec3468e3738be14d64468e2a05720 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/8340 Tested-by: build bot (Jenkins) Reviewed-by: Timothy Pearson Reviewed-by: Alexandru Gagniuc --- 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 f7feb4eb1c..764f46b612 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 b93c07c9fb..ea2511511c 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 2df3434c7f..78b89de4b0 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 e9791a55d6..5837f52ab4 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 50881086a5..5df8acf29a 100644 --- a/src/southbridge/nvidia/ck804/lpc.c +++ b/src/southbridge/nvidia/ck804/lpc.c @@ -38,8 +38,6 @@ #include #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 26a596d0e5..b827dcffd4 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 94cfdb1356..627949d22c 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 ef7707a362..1110a99ea6 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 8943520098..f4359563be 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 ac0f9e5dd7..270d085feb 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 ed67c33b2a..9f802cde2d 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 0597aac6c1..92ee5fae99 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, };