From 2aa3b16a2b9489e9e98da5554c4babed9b6b224c Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Tue, 27 Nov 2018 17:02:10 +0100 Subject: src/drivers: Remove needless '&' on function pointers Change-Id: I7a99d0dcbc8ea1362a12a68fa519c49058d30a05 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/29868 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/drivers/generic/adau7002/adau7002.c | 6 +++--- src/drivers/generic/generic/generic.c | 6 +++--- src/drivers/generic/gpio_keys/gpio_keys.c | 6 +++--- src/drivers/generic/gpio_regulator/gpio_regulator.c | 6 +++--- src/drivers/generic/max98357a/max98357a.c | 6 +++--- src/drivers/i2c/da7219/da7219.c | 6 +++--- src/drivers/i2c/generic/generic.c | 6 +++--- src/drivers/i2c/hid/hid.c | 6 +++--- src/drivers/i2c/max98373/max98373.c | 6 +++--- src/drivers/i2c/max98927/max98927.c | 6 +++--- src/drivers/i2c/nau8825/nau8825.c | 6 +++--- src/drivers/i2c/rt5663/rt5663.c | 6 +++--- src/drivers/i2c/sx9310/sx9310.c | 6 +++--- src/drivers/i2c/tpm/chip.c | 6 +++--- src/drivers/intel/mipi_camera/camera.c | 6 +++--- src/drivers/intel/wifi/wifi.c | 6 +++--- src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c | 2 +- src/drivers/net/r8168.c | 4 ++-- src/drivers/pc80/tpm/tis.c | 8 ++++---- src/drivers/ricoh/rce822/rce822.c | 2 +- src/drivers/spi/acpi/acpi.c | 6 +++--- src/drivers/usb/acpi/usb_acpi.c | 6 +++--- 22 files changed, 62 insertions(+), 62 deletions(-) (limited to 'src') diff --git a/src/drivers/generic/adau7002/adau7002.c b/src/drivers/generic/adau7002/adau7002.c index 38d3d07a01..a8a4128573 100644 --- a/src/drivers/generic/adau7002/adau7002.c +++ b/src/drivers/generic/adau7002/adau7002.c @@ -72,8 +72,8 @@ static struct device_operations adau7002_ops = { .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &adau7002_acpi_name, - .acpi_fill_ssdt_generator = &adau7002_fill_ssdt, + .acpi_name = adau7002_acpi_name, + .acpi_fill_ssdt_generator = adau7002_fill_ssdt, #endif }; @@ -84,5 +84,5 @@ static void adau7002_enable(struct device *dev) struct chip_operations drivers_generic_adau7002_ops = { CHIP_NAME("Analog Digital DMIC") - .enable_dev = &adau7002_enable + .enable_dev = adau7002_enable }; diff --git a/src/drivers/generic/generic/generic.c b/src/drivers/generic/generic/generic.c index 37fbab5c61..b5541a399d 100644 --- a/src/drivers/generic/generic/generic.c +++ b/src/drivers/generic/generic/generic.c @@ -83,8 +83,8 @@ static struct device_operations generic_dev_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &generic_dev_acpi_name, - .acpi_fill_ssdt_generator = &generic_dev_fill_ssdt_generator, + .acpi_name = generic_dev_acpi_name, + .acpi_fill_ssdt_generator = generic_dev_fill_ssdt_generator, }; static void generic_dev_enable(struct device *dev) @@ -94,5 +94,5 @@ static void generic_dev_enable(struct device *dev) struct chip_operations drivers_generic_generic_ops = { CHIP_NAME("Generic Device") - .enable_dev = &generic_dev_enable + .enable_dev = generic_dev_enable }; diff --git a/src/drivers/generic/gpio_keys/gpio_keys.c b/src/drivers/generic/gpio_keys/gpio_keys.c index 5ecb63e685..77e7740c1c 100644 --- a/src/drivers/generic/gpio_keys/gpio_keys.c +++ b/src/drivers/generic/gpio_keys/gpio_keys.c @@ -116,8 +116,8 @@ static struct device_operations gpio_keys_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &gpio_keys_acpi_name, - .acpi_fill_ssdt_generator = &gpio_keys_fill_ssdt_generator, + .acpi_name = gpio_keys_acpi_name, + .acpi_fill_ssdt_generator = gpio_keys_fill_ssdt_generator, }; static void gpio_keys_enable(struct device *dev) @@ -127,5 +127,5 @@ static void gpio_keys_enable(struct device *dev) struct chip_operations drivers_generic_gpio_keys_ops = { CHIP_NAME("GPIO Keys") - .enable_dev = &gpio_keys_enable + .enable_dev = gpio_keys_enable }; diff --git a/src/drivers/generic/gpio_regulator/gpio_regulator.c b/src/drivers/generic/gpio_regulator/gpio_regulator.c index c038392bb7..3b335252bb 100644 --- a/src/drivers/generic/gpio_regulator/gpio_regulator.c +++ b/src/drivers/generic/gpio_regulator/gpio_regulator.c @@ -75,8 +75,8 @@ static struct device_operations gpio_regulator_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &gpio_regulator_acpi_name, - .acpi_fill_ssdt_generator = &gpio_regulator_fill_ssdt_generator, + .acpi_name = gpio_regulator_acpi_name, + .acpi_fill_ssdt_generator = gpio_regulator_fill_ssdt_generator, }; static void gpio_regulator_enable(struct device *dev) @@ -86,5 +86,5 @@ static void gpio_regulator_enable(struct device *dev) struct chip_operations drivers_generic_gpio_regulator_ops = { CHIP_NAME("GPIO Regulator") - .enable_dev = &gpio_regulator_enable + .enable_dev = gpio_regulator_enable }; diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c index f9b2d6cb55..8e5ea0c91e 100644 --- a/src/drivers/generic/max98357a/max98357a.c +++ b/src/drivers/generic/max98357a/max98357a.c @@ -77,8 +77,8 @@ static struct device_operations max98357a_ops = { .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &max98357a_acpi_name, - .acpi_fill_ssdt_generator = &max98357a_fill_ssdt, + .acpi_name = max98357a_acpi_name, + .acpi_fill_ssdt_generator = max98357a_fill_ssdt, #endif }; @@ -105,5 +105,5 @@ static void max98357a_enable(struct device *dev) struct chip_operations drivers_generic_max98357a_ops = { CHIP_NAME("Maxim Integrated 98357A Amplifier") - .enable_dev = &max98357a_enable + .enable_dev = max98357a_enable }; diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c index d2a4b78651..ebc22e0d61 100644 --- a/src/drivers/i2c/da7219/da7219.c +++ b/src/drivers/i2c/da7219/da7219.c @@ -114,8 +114,8 @@ static struct device_operations da7219_ops = { .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &da7219_acpi_name, - .acpi_fill_ssdt_generator = &da7219_fill_ssdt, + .acpi_name = da7219_acpi_name, + .acpi_fill_ssdt_generator = da7219_fill_ssdt, #endif }; @@ -126,5 +126,5 @@ static void da7219_enable(struct device *dev) struct chip_operations drivers_i2c_da7219_ops = { CHIP_NAME("Dialog Semiconductor DA7219 Audio Codec") - .enable_dev = &da7219_enable + .enable_dev = da7219_enable }; diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c index df929b779c..ca2dfafdc5 100644 --- a/src/drivers/i2c/generic/generic.c +++ b/src/drivers/i2c/generic/generic.c @@ -193,8 +193,8 @@ static struct device_operations i2c_generic_ops = { .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &i2c_generic_acpi_name, - .acpi_fill_ssdt_generator = &i2c_generic_fill_ssdt_generator, + .acpi_name = i2c_generic_acpi_name, + .acpi_fill_ssdt_generator = i2c_generic_fill_ssdt_generator, #endif }; @@ -228,5 +228,5 @@ static void i2c_generic_enable(struct device *dev) struct chip_operations drivers_i2c_generic_ops = { CHIP_NAME("I2C Device") - .enable_dev = &i2c_generic_enable + .enable_dev = i2c_generic_enable }; diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c index bccce75a5d..952e3e49f0 100644 --- a/src/drivers/i2c/hid/hid.c +++ b/src/drivers/i2c/hid/hid.c @@ -51,8 +51,8 @@ static struct device_operations i2c_hid_ops = { .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &i2c_hid_acpi_name, - .acpi_fill_ssdt_generator = &i2c_hid_fill_ssdt_generator, + .acpi_name = i2c_hid_acpi_name, + .acpi_fill_ssdt_generator = i2c_hid_fill_ssdt_generator, #endif }; @@ -69,5 +69,5 @@ static void i2c_hid_enable(struct device *dev) struct chip_operations drivers_i2c_hid_ops = { CHIP_NAME("I2C HID Device") - .enable_dev = &i2c_hid_enable + .enable_dev = i2c_hid_enable }; diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c index e019b7076e..e10ccf1c12 100644 --- a/src/drivers/i2c/max98373/max98373.c +++ b/src/drivers/i2c/max98373/max98373.c @@ -91,8 +91,8 @@ static struct device_operations max98373_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &max98373_acpi_name, - .acpi_fill_ssdt_generator = &max98373_fill_ssdt, + .acpi_name = max98373_acpi_name, + .acpi_fill_ssdt_generator = max98373_fill_ssdt, }; static void max98373_enable(struct device *dev) @@ -108,5 +108,5 @@ static void max98373_enable(struct device *dev) struct chip_operations drivers_i2c_max98373_ops = { CHIP_NAME("Maxim MAX98373 Codec") - .enable_dev = &max98373_enable + .enable_dev = max98373_enable }; diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c index ec0503410f..68a167d4a3 100644 --- a/src/drivers/i2c/max98927/max98927.c +++ b/src/drivers/i2c/max98927/max98927.c @@ -87,8 +87,8 @@ static struct device_operations max98927_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &max98927_acpi_name, - .acpi_fill_ssdt_generator = &max98927_fill_ssdt, + .acpi_name = max98927_acpi_name, + .acpi_fill_ssdt_generator = max98927_fill_ssdt, }; static void max98927_enable(struct device *dev) @@ -104,5 +104,5 @@ static void max98927_enable(struct device *dev) struct chip_operations drivers_i2c_max98927_ops = { CHIP_NAME("Maxim MAX98927 Codec") - .enable_dev = &max98927_enable + .enable_dev = max98927_enable }; diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c index 86d4306ab7..3f905125c4 100644 --- a/src/drivers/i2c/nau8825/nau8825.c +++ b/src/drivers/i2c/nau8825/nau8825.c @@ -103,8 +103,8 @@ static struct device_operations nau8825_ops = { .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &nau8825_acpi_name, - .acpi_fill_ssdt_generator = &nau8825_fill_ssdt, + .acpi_name = nau8825_acpi_name, + .acpi_fill_ssdt_generator = nau8825_fill_ssdt, #endif }; @@ -115,5 +115,5 @@ static void nau8825_enable(struct device *dev) struct chip_operations drivers_i2c_nau8825_ops = { CHIP_NAME("Nuvoton NAU8825 Codec") - .enable_dev = &nau8825_enable + .enable_dev = nau8825_enable }; diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c index 38b2a9853a..1ce5993dad 100644 --- a/src/drivers/i2c/rt5663/rt5663.c +++ b/src/drivers/i2c/rt5663/rt5663.c @@ -91,8 +91,8 @@ static struct device_operations rt5663_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &rt5663_acpi_name, - .acpi_fill_ssdt_generator = &rt5663_fill_ssdt, + .acpi_name = rt5663_acpi_name, + .acpi_fill_ssdt_generator = rt5663_fill_ssdt, }; static void rt5663_enable(struct device *dev) @@ -102,5 +102,5 @@ static void rt5663_enable(struct device *dev) struct chip_operations drivers_i2c_rt5663_ops = { CHIP_NAME("Realtek RT5663 Codec") - .enable_dev = &rt5663_enable + .enable_dev = rt5663_enable }; diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c index 0e98bcb941..afd9e3581f 100644 --- a/src/drivers/i2c/sx9310/sx9310.c +++ b/src/drivers/i2c/sx9310/sx9310.c @@ -85,8 +85,8 @@ static struct device_operations i2c_sx9310_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &i2c_sx9310_acpi_name, - .acpi_fill_ssdt_generator = &i2c_sx9310_fill_ssdt, + .acpi_name = i2c_sx9310_acpi_name, + .acpi_fill_ssdt_generator = i2c_sx9310_fill_ssdt, }; static void i2c_sx9310_enable(struct device *dev) @@ -106,5 +106,5 @@ static void i2c_sx9310_enable(struct device *dev) struct chip_operations drivers_i2c_sx9310_ops = { CHIP_NAME(I2C_SX9310_ACPI_NAME) - .enable_dev = &i2c_sx9310_enable + .enable_dev = i2c_sx9310_enable }; diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c index 3dbe8115d7..687ce050ed 100644 --- a/src/drivers/i2c/tpm/chip.c +++ b/src/drivers/i2c/tpm/chip.c @@ -78,8 +78,8 @@ static struct device_operations i2c_tpm_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &i2c_tpm_acpi_name, - .acpi_fill_ssdt_generator = &i2c_tpm_fill_ssdt, + .acpi_name = i2c_tpm_acpi_name, + .acpi_fill_ssdt_generator = i2c_tpm_fill_ssdt, }; static void i2c_tpm_enable(struct device *dev) @@ -95,5 +95,5 @@ static void i2c_tpm_enable(struct device *dev) struct chip_operations drivers_i2c_tpm_ops = { CHIP_NAME("I2C TPM") - .enable_dev = &i2c_tpm_enable + .enable_dev = i2c_tpm_enable }; diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c index cdb9da300b..0cea0ba311 100644 --- a/src/drivers/intel/mipi_camera/camera.c +++ b/src/drivers/intel/mipi_camera/camera.c @@ -84,8 +84,8 @@ static struct device_operations camera_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &camera_acpi_name, - .acpi_fill_ssdt_generator = &camera_fill_ssdt, + .acpi_name = camera_acpi_name, + .acpi_fill_ssdt_generator = camera_fill_ssdt, }; static void camera_enable(struct device *dev) @@ -95,5 +95,5 @@ static void camera_enable(struct device *dev) struct chip_operations drivers_intel_mipi_camera_ops = { CHIP_NAME("Intel MIPI Camera Device") - .enable_dev = &camera_enable + .enable_dev = camera_enable }; diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c index 01a338d1d5..cd512ea3bb 100644 --- a/src/drivers/intel/wifi/wifi.c +++ b/src/drivers/intel/wifi/wifi.c @@ -306,8 +306,8 @@ struct device_operations device_ops = { #endif .ops_pci = &pci_ops, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &intel_wifi_acpi_name, - .acpi_fill_ssdt_generator = &intel_wifi_fill_ssdt, + .acpi_name = intel_wifi_acpi_name, + .acpi_fill_ssdt_generator = intel_wifi_fill_ssdt, #endif }; @@ -366,5 +366,5 @@ static void intel_wifi_enable(struct device *dev) struct chip_operations drivers_intel_wifi_ops = { CHIP_NAME("Intel WiFi") - .enable_dev = &intel_wifi_enable + .enable_dev = intel_wifi_enable }; diff --git a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c index 4fa5b81e8e..b6d22415f5 100644 --- a/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c +++ b/src/drivers/lenovo/hybrid_graphics/hybrid_graphics.c @@ -68,5 +68,5 @@ static void lenovo_hybrid_graphics_enable(struct device *dev) struct chip_operations drivers_lenovo_hybrid_graphics_ops = { CHIP_NAME("Lenovo hybrid graphics driver") - .enable_dev = &lenovo_hybrid_graphics_enable + .enable_dev = lenovo_hybrid_graphics_enable }; diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c index 5280cb67ec..4057ffde52 100644 --- a/src/drivers/net/r8168.c +++ b/src/drivers/net/r8168.c @@ -347,8 +347,8 @@ static struct device_operations r8168_ops = { .init = r8168_init, .scan_bus = 0, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &r8168_net_acpi_name, - .acpi_fill_ssdt_generator = &r8168_net_fill_ssdt, + .acpi_name = r8168_net_acpi_name, + .acpi_fill_ssdt_generator = r8168_net_fill_ssdt, #endif }; diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index f7d9d6f152..d63dcbe94d 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -979,11 +979,11 @@ static const char *lpc_tpm_acpi_name(const struct device *dev) #endif static struct device_operations lpc_tpm_ops = { - .read_resources = &lpc_tpm_read_resources, - .set_resources = &lpc_tpm_set_resources, + .read_resources = lpc_tpm_read_resources, + .set_resources = lpc_tpm_set_resources, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) - .acpi_name = &lpc_tpm_acpi_name, - .acpi_fill_ssdt_generator = &lpc_tpm_fill_ssdt, + .acpi_name = lpc_tpm_acpi_name, + .acpi_fill_ssdt_generator = lpc_tpm_fill_ssdt, #endif }; diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c index b16b05a91c..d576762989 100644 --- a/src/drivers/ricoh/rce822/rce822.c +++ b/src/drivers/ricoh/rce822/rce822.c @@ -51,7 +51,7 @@ static void rce822_set_subsystem(struct device *dev, unsigned int vendor, } static struct pci_operations lops_pci = { - .set_subsystem = &rce822_set_subsystem, + .set_subsystem = rce822_set_subsystem, }; static struct device_operations rce822_ops = { diff --git a/src/drivers/spi/acpi/acpi.c b/src/drivers/spi/acpi/acpi.c index cf75f9ef88..7c8a887242 100644 --- a/src/drivers/spi/acpi/acpi.c +++ b/src/drivers/spi/acpi/acpi.c @@ -205,8 +205,8 @@ static struct device_operations spi_acpi_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .acpi_name = &spi_acpi_name, - .acpi_fill_ssdt_generator = &spi_acpi_fill_ssdt_generator, + .acpi_name = spi_acpi_name, + .acpi_fill_ssdt_generator = spi_acpi_fill_ssdt_generator, }; static void spi_acpi_enable(struct device *dev) @@ -216,5 +216,5 @@ static void spi_acpi_enable(struct device *dev) struct chip_operations drivers_spi_acpi_ops = { CHIP_NAME("SPI Device") - .enable_dev = &spi_acpi_enable + .enable_dev = spi_acpi_enable }; diff --git a/src/drivers/usb/acpi/usb_acpi.c b/src/drivers/usb/acpi/usb_acpi.c index abc1718eb9..8c63d2aa6c 100644 --- a/src/drivers/usb/acpi/usb_acpi.c +++ b/src/drivers/usb/acpi/usb_acpi.c @@ -86,8 +86,8 @@ static struct device_operations usb_acpi_ops = { .read_resources = DEVICE_NOOP, .set_resources = DEVICE_NOOP, .enable_resources = DEVICE_NOOP, - .scan_bus = &scan_usb_bus, - .acpi_fill_ssdt_generator = &usb_acpi_fill_ssdt_generator, + .scan_bus = scan_usb_bus, + .acpi_fill_ssdt_generator = usb_acpi_fill_ssdt_generator, }; static void usb_acpi_enable(struct device *dev) @@ -97,5 +97,5 @@ static void usb_acpi_enable(struct device *dev) struct chip_operations drivers_usb_acpi_ops = { CHIP_NAME("USB ACPI Device") - .enable_dev = &usb_acpi_enable + .enable_dev = usb_acpi_enable }; -- cgit v1.2.3