From 1d191273304d658fcf5a832c163c4230b1575127 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Tue, 27 Nov 2018 12:23:48 +0100 Subject: soc/{amd,intel}: Remove needless '&' on function pointers Change-Id: I7a59fd2f370d2b0d830ca83be9a9bc1abe2750f5 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/29862 Tested-by: build bot (Jenkins) Reviewed-by: Alex Thiessen --- src/soc/intel/apollolake/chip.c | 6 +++--- src/soc/intel/broadwell/adsp.c | 8 ++++---- src/soc/intel/broadwell/ehci.c | 8 ++++---- src/soc/intel/broadwell/sata.c | 10 +++++----- src/soc/intel/broadwell/smbus.c | 10 +++++----- src/soc/intel/broadwell/systemagent.c | 10 +++++----- src/soc/intel/broadwell/xhci.c | 8 ++++---- src/soc/intel/common/block/dsp/dsp.c | 8 ++++---- src/soc/intel/common/block/hda/hda.c | 10 +++++----- src/soc/intel/common/block/i2c/i2c.c | 12 ++++++------ src/soc/intel/common/block/pmc/pmc.c | 10 +++++----- src/soc/intel/common/block/sata/sata.c | 6 +++--- src/soc/intel/common/block/scs/sd.c | 8 ++++---- src/soc/intel/common/block/smbus/smbus.c | 10 +++++----- src/soc/intel/common/block/spi/spi.c | 8 ++++---- src/soc/intel/common/block/systemagent/systemagent.c | 6 +++--- src/soc/intel/common/block/uart/uart.c | 6 +++--- src/soc/intel/common/block/xdci/xdci.c | 6 +++--- src/soc/intel/common/block/xhci/xhci.c | 10 +++++----- src/soc/intel/denverton_ns/chip.c | 6 +++--- src/soc/intel/denverton_ns/systemagent.c | 8 ++++---- src/soc/intel/fsp_broadwell_de/smbus.c | 12 ++++++------ src/soc/intel/quark/lpc.c | 8 ++++---- src/soc/intel/quark/northcluster.c | 6 +++--- src/soc/intel/quark/uart.c | 6 +++--- 25 files changed, 103 insertions(+), 103 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index b38265fdd4..0d6d6d5587 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -679,9 +679,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd) struct chip_operations soc_intel_apollolake_ops = { CHIP_NAME("Intel Apollolake SOC") - .enable_dev = &enable_dev, - .init = &soc_init, - .final = &soc_final + .enable_dev = enable_dev, + .init = soc_init, + .final = soc_final }; static void drop_privilege_all(void) diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/adsp.c index 261445b0ec..72a4b8cd92 100644 --- a/src/soc/intel/broadwell/adsp.c +++ b/src/soc/intel/broadwell/adsp.c @@ -142,10 +142,10 @@ static void adsp_init(struct device *dev) } static struct device_operations adsp_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .init = &adsp_init, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = adsp_init, .ops_pci = &broadwell_pci_ops, }; diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/ehci.c index be4672704c..8972f56411 100644 --- a/src/soc/intel/broadwell/ehci.c +++ b/src/soc/intel/broadwell/ehci.c @@ -58,11 +58,11 @@ static struct pci_operations ehci_ops_pci = { }; static struct device_operations usb_ehci_ops = { - .read_resources = &pci_ehci_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_ehci_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .ops_pci = &ehci_ops_pci, - .enable = &ehci_enable, + .enable = ehci_enable, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/broadwell/sata.c b/src/soc/intel/broadwell/sata.c index 3dadcccaac..f66eb0a04b 100644 --- a/src/soc/intel/broadwell/sata.c +++ b/src/soc/intel/broadwell/sata.c @@ -279,11 +279,11 @@ static void sata_enable(struct device *dev) } static struct device_operations sata_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .init = &sata_init, - .enable = &sata_enable, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = sata_init, + .enable = sata_enable, .ops_pci = &broadwell_pci_ops, }; diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/smbus.c index 26483fd2bc..9367f3332e 100644 --- a/src/soc/intel/broadwell/smbus.c +++ b/src/soc/intel/broadwell/smbus.c @@ -86,11 +86,11 @@ static void smbus_read_resources(struct device *dev) } static struct device_operations smbus_ops = { - .read_resources = &smbus_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_smbus, - .init = &pch_smbus_init, + .read_resources = smbus_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .scan_bus = scan_smbus, + .init = pch_smbus_init, .ops_smbus_bus = &lops_smbus_bus, .ops_pci = &broadwell_pci_ops, }; diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c index e0d8b765a4..2ef8691007 100644 --- a/src/soc/intel/broadwell/systemagent.c +++ b/src/soc/intel/broadwell/systemagent.c @@ -439,11 +439,11 @@ static void systemagent_init(struct device *dev) } static struct device_operations systemagent_ops = { - .read_resources = &systemagent_read_resources, - .acpi_fill_ssdt_generator = &generate_cpu_entries, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .init = &systemagent_init, + .read_resources = systemagent_read_resources, + .acpi_fill_ssdt_generator = generate_cpu_entries, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = systemagent_init, .ops_pci = &broadwell_pci_ops, }; diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c index aba1123492..b5980df3fd 100644 --- a/src/soc/intel/broadwell/xhci.c +++ b/src/soc/intel/broadwell/xhci.c @@ -216,11 +216,11 @@ static void xhci_init(struct device *dev) } static struct device_operations usb_xhci_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .ops_pci = &broadwell_pci_ops, - .init = &xhci_init, + .init = xhci_init, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c index 65c86cc8e7..2bd6599aae 100644 --- a/src/soc/intel/common/block/dsp/dsp.c +++ b/src/soc/intel/common/block/dsp/dsp.c @@ -19,11 +19,11 @@ #include static struct device_operations dsp_dev_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .ops_pci = &pci_dev_ops_pci, - .scan_bus = &scan_static_bus, + .scan_bus = scan_static_bus, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c index 5e09dddfd4..4de31372c3 100644 --- a/src/soc/intel/common/block/hda/hda.c +++ b/src/soc/intel/common/block/hda/hda.c @@ -61,14 +61,14 @@ static void hda_init(struct device *dev) #endif static struct device_operations hda_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, #if IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB) - .init = &hda_init, + .init = hda_init, #endif .ops_pci = &pci_dev_ops_pci, - .scan_bus = &scan_static_bus, + .scan_bus = scan_static_bus, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index f72adfce8a..b7f240ee28 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -170,14 +170,14 @@ static void dw_i2c_device_init(struct device *dev) } static struct device_operations i2c_dev_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_smbus, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .scan_bus = scan_smbus, .ops_i2c_bus = &dw_i2c_bus_ops, .ops_pci = &pci_dev_ops_pci, - .init = &dw_i2c_device_init, - .acpi_fill_ssdt_generator = &dw_i2c_acpi_fill_ssdt, + .init = dw_i2c_device_init, + .acpi_fill_ssdt_generator = dw_i2c_acpi_fill_ssdt, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index e418db0df0..9f1b94f904 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -112,12 +112,12 @@ void pmc_set_acpi_mode(void) } static struct device_operations device_ops = { - .read_resources = &pch_pmc_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .init = &pmc_soc_init, + .read_resources = pch_pmc_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = pmc_soc_init, .ops_pci = &pci_dev_ops_pci, - .scan_bus = &scan_lpc_bus, + .scan_bus = scan_lpc_bus, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c index a600cb9b4c..936fc9b67a 100644 --- a/src/soc/intel/common/block/sata/sata.c +++ b/src/soc/intel/common/block/sata/sata.c @@ -62,9 +62,9 @@ static void sata_final(struct device *dev) } static struct device_operations sata_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .final = sata_final, .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c index 812146f960..c8dc7d12b4 100644 --- a/src/soc/intel/common/block/scs/sd.c +++ b/src/soc/intel/common/block/scs/sd.c @@ -56,11 +56,11 @@ static void sd_fill_ssdt(struct device *dev) #endif static struct device_operations dev_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_fill_ssdt_generator = &sd_fill_ssdt, + .acpi_fill_ssdt_generator = sd_fill_ssdt, #endif .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index 83dfedf569..228713876b 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -78,11 +78,11 @@ static void smbus_read_resources(struct device *dev) } static struct device_operations smbus_ops = { - .read_resources = &smbus_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_smbus, - .init = &pch_smbus_init, + .read_resources = smbus_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .scan_bus = scan_smbus, + .init = pch_smbus_init, .ops_pci = &pci_dev_ops_pci, .ops_smbus_bus = &lops_smbus_bus, }; diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c index 6038f46f37..69449e79d5 100644 --- a/src/soc/intel/common/block/spi/spi.c +++ b/src/soc/intel/common/block/spi/spi.c @@ -44,10 +44,10 @@ static struct spi_bus_operations spi_bus_ops = { }; static struct device_operations spi_dev_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_generic_bus, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .scan_bus = scan_generic_bus, .ops_spi_bus = &spi_bus_ops, .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index 96083591c3..a85bcaba90 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -278,9 +278,9 @@ void enable_power_aware_intr(void) } static struct device_operations systemagent_ops = { - .read_resources = &systemagent_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = systemagent_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .init = soc_systemagent_init, .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index f0b6b24b70..57d9ebedd6 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -235,9 +235,9 @@ static void uart_common_enable_resources(struct device *dev) } static struct device_operations device_ops = { - .read_resources = &uart_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &uart_common_enable_resources, + .read_resources = uart_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = uart_common_enable_resources, .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c index d2e876925f..0ee63657e4 100644 --- a/src/soc/intel/common/block/xdci/xdci.c +++ b/src/soc/intel/common/block/xdci/xdci.c @@ -29,9 +29,9 @@ int xdci_can_enable(void) } static struct device_operations usb_xdci_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .init = soc_xdci_init, .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 9641177683..ab87f365da 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -24,14 +24,14 @@ __weak void soc_xhci_init(struct device *dev) { /* no-op */ } static struct device_operations usb_xhci_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, .init = soc_xhci_init, .ops_pci = &pci_dev_ops_pci, - .scan_bus = &scan_usb_bus, + .scan_bus = scan_usb_bus, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &soc_acpi_name, + .acpi_name = soc_acpi_name, #endif }; diff --git a/src/soc/intel/denverton_ns/chip.c b/src/soc/intel/denverton_ns/chip.c index d0a21ac335..0f3c8a08e6 100644 --- a/src/soc/intel/denverton_ns/chip.c +++ b/src/soc/intel/denverton_ns/chip.c @@ -123,9 +123,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd) struct chip_operations soc_intel_denverton_ns_ops = { CHIP_NAME("Intel Denverton-NS SOC") - .enable_dev = &soc_enable_dev, - .init = &soc_init, - .final = &soc_final + .enable_dev = soc_enable_dev, + .init = soc_init, + .final = soc_final }; static void soc_set_subsystem(struct device *dev, uint32_t vendor, diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c index 6ffa2c70ca..abce0abfba 100644 --- a/src/soc/intel/denverton_ns/systemagent.c +++ b/src/soc/intel/denverton_ns/systemagent.c @@ -335,10 +335,10 @@ static void systemagent_init(struct device *dev) } static struct device_operations systemagent_ops = { - .read_resources = &systemagent_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .init = &systemagent_init, + .read_resources = systemagent_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = systemagent_init, .ops_pci = &soc_pci_ops, }; diff --git a/src/soc/intel/fsp_broadwell_de/smbus.c b/src/soc/intel/fsp_broadwell_de/smbus.c index 339d47be8b..94474f713e 100644 --- a/src/soc/intel/fsp_broadwell_de/smbus.c +++ b/src/soc/intel/fsp_broadwell_de/smbus.c @@ -75,12 +75,12 @@ static struct smbus_bus_operations lops_smbus_bus = { }; static struct device_operations smbus_ops = { - .read_resources = &pci_dev_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_smbus, - .init = &pch_smbus_init, - .enable = &pch_smbus_enable, + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .scan_bus = scan_smbus, + .init = pch_smbus_init, + .enable = pch_smbus_enable, .ops_smbus_bus = &lops_smbus_bus, }; diff --git a/src/soc/intel/quark/lpc.c b/src/soc/intel/quark/lpc.c index 809122be1b..19f7ceb215 100644 --- a/src/soc/intel/quark/lpc.c +++ b/src/soc/intel/quark/lpc.c @@ -50,10 +50,10 @@ static void pmc_read_resources(struct device *dev) } static struct device_operations device_ops = { - .read_resources = &pmc_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, - .scan_bus = &scan_lpc_bus, + .read_resources = pmc_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .scan_bus = scan_lpc_bus, }; static const struct pci_driver pmc __pci_driver = { diff --git a/src/soc/intel/quark/northcluster.c b/src/soc/intel/quark/northcluster.c index 01ff6b522e..0507efcfa3 100644 --- a/src/soc/intel/quark/northcluster.c +++ b/src/soc/intel/quark/northcluster.c @@ -71,9 +71,9 @@ static void nc_read_resources(struct device *dev) } static struct device_operations nc_ops = { - .read_resources = &nc_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = nc_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, }; static const struct pci_driver systemagent_driver __pci_driver = { diff --git a/src/soc/intel/quark/uart.c b/src/soc/intel/quark/uart.c index 0d86284564..0037621941 100644 --- a/src/soc/intel/quark/uart.c +++ b/src/soc/intel/quark/uart.c @@ -36,9 +36,9 @@ static void uart_read_resources(struct device *dev) } static struct device_operations device_ops = { - .read_resources = &uart_read_resources, - .set_resources = &pci_dev_set_resources, - .enable_resources = &pci_dev_enable_resources, + .read_resources = uart_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, }; static const struct pci_driver uart_driver __pci_driver = { -- cgit v1.2.3