From 2f8ba69b0ee5deafa9bad20c2a7b2b4785fcb565 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 5 Apr 2020 14:05:24 +0200 Subject: Replace DEVICE_NOOP with noop_(set|read)_resources `.read_resources` and `.set_resources` are the only two device operations that are considered mandatory. Other function pointers can be left NULL. Having dedicated no-op implementations for the two mandatory fields should stop the leaking of no-op pointers to other fields. Change-Id: I6469a7568dc24317c95e238749d878e798b0a362 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/40207 Reviewed-by: Angel Pons Reviewed-by: Paul Menzel Reviewed-by: HAOUAS Elyes Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- src/drivers/i2c/adt7463/adt7463.c | 4 ++-- src/drivers/i2c/at24rf08c/at24rf08c.c | 4 ++-- src/drivers/i2c/ck505/ck505.c | 4 ++-- src/drivers/i2c/da7219/da7219.c | 4 ++-- src/drivers/i2c/generic/generic.c | 4 ++-- src/drivers/i2c/hid/hid.c | 4 ++-- src/drivers/i2c/lm96000/lm96000.c | 4 ++-- src/drivers/i2c/max98373/max98373.c | 4 ++-- src/drivers/i2c/max98927/max98927.c | 4 ++-- src/drivers/i2c/nau8825/nau8825.c | 4 ++-- src/drivers/i2c/nct7802y/nct7802y.c | 4 ++-- src/drivers/i2c/pca9538/pca9538.c | 4 ++-- src/drivers/i2c/pcf8523/pcf8523.c | 4 ++-- src/drivers/i2c/ptn3460/ptn3460.c | 4 ++-- src/drivers/i2c/rt1011/rt1011.c | 4 ++-- src/drivers/i2c/rt5663/rt5663.c | 4 ++-- src/drivers/i2c/rtd2132/rtd2132.c | 4 ++-- src/drivers/i2c/rx6110sa/rx6110sa.c | 4 ++-- src/drivers/i2c/sx9310/sx9310.c | 4 ++-- src/drivers/i2c/tpm/chip.c | 4 ++-- src/drivers/i2c/w83793/w83793.c | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) (limited to 'src/drivers/i2c') diff --git a/src/drivers/i2c/adt7463/adt7463.c b/src/drivers/i2c/adt7463/adt7463.c index 3e1a3a5859..2fcd54e647 100644 --- a/src/drivers/i2c/adt7463/adt7463.c +++ b/src/drivers/i2c/adt7463/adt7463.c @@ -78,8 +78,8 @@ static void adt7463_init(struct device *adt7463) } static struct device_operations adt7463_operations = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = adt7463_init, }; diff --git a/src/drivers/i2c/at24rf08c/at24rf08c.c b/src/drivers/i2c/at24rf08c/at24rf08c.c index 3841d64fd6..3511502b76 100644 --- a/src/drivers/i2c/at24rf08c/at24rf08c.c +++ b/src/drivers/i2c/at24rf08c/at24rf08c.c @@ -33,8 +33,8 @@ static void at24rf08c_init(struct device *dev) } static struct device_operations at24rf08c_operations = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = at24rf08c_init, }; diff --git a/src/drivers/i2c/ck505/ck505.c b/src/drivers/i2c/ck505/ck505.c index fac5208577..147776d3f4 100644 --- a/src/drivers/i2c/ck505/ck505.c +++ b/src/drivers/i2c/ck505/ck505.c @@ -46,8 +46,8 @@ static void ck505_init(struct device *dev) } static struct device_operations ck505_operations = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = ck505_init, }; diff --git a/src/drivers/i2c/da7219/da7219.c b/src/drivers/i2c/da7219/da7219.c index 43c6f9d41b..4cfeb9fb72 100644 --- a/src/drivers/i2c/da7219/da7219.c +++ b/src/drivers/i2c/da7219/da7219.c @@ -98,8 +98,8 @@ static const char *da7219_acpi_name(const struct device *dev) #endif static struct device_operations da7219_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = da7219_acpi_name, .acpi_fill_ssdt = da7219_fill_ssdt, diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c index 32b984a85f..0466a6fe31 100644 --- a/src/drivers/i2c/generic/generic.c +++ b/src/drivers/i2c/generic/generic.c @@ -180,8 +180,8 @@ static const char *i2c_generic_acpi_name(const struct device *dev) #endif static struct device_operations i2c_generic_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = i2c_generic_acpi_name, .acpi_fill_ssdt = i2c_generic_fill_ssdt_generator, diff --git a/src/drivers/i2c/hid/hid.c b/src/drivers/i2c/hid/hid.c index 11d9d18298..de43eb9ba5 100644 --- a/src/drivers/i2c/hid/hid.c +++ b/src/drivers/i2c/hid/hid.c @@ -37,8 +37,8 @@ static const char *i2c_hid_acpi_name(const struct device *dev) #endif static struct device_operations i2c_hid_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = i2c_hid_acpi_name, .acpi_fill_ssdt = i2c_hid_fill_ssdt_generator, diff --git a/src/drivers/i2c/lm96000/lm96000.c b/src/drivers/i2c/lm96000/lm96000.c index 54d2b88e7c..b1cf06eca2 100644 --- a/src/drivers/i2c/lm96000/lm96000.c +++ b/src/drivers/i2c/lm96000/lm96000.c @@ -205,8 +205,8 @@ static void lm96000_init(struct device *const dev) } static struct device_operations lm96000_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = lm96000_init, }; diff --git a/src/drivers/i2c/max98373/max98373.c b/src/drivers/i2c/max98373/max98373.c index c6fa2e48d4..a7df56baa0 100644 --- a/src/drivers/i2c/max98373/max98373.c +++ b/src/drivers/i2c/max98373/max98373.c @@ -75,8 +75,8 @@ static const char *max98373_acpi_name(const struct device *dev) } static struct device_operations max98373_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .acpi_name = max98373_acpi_name, .acpi_fill_ssdt = max98373_fill_ssdt, }; diff --git a/src/drivers/i2c/max98927/max98927.c b/src/drivers/i2c/max98927/max98927.c index 166a4ef87b..0cb80ae88a 100644 --- a/src/drivers/i2c/max98927/max98927.c +++ b/src/drivers/i2c/max98927/max98927.c @@ -71,8 +71,8 @@ static const char *max98927_acpi_name(const struct device *dev) } static struct device_operations max98927_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .acpi_name = max98927_acpi_name, .acpi_fill_ssdt = max98927_fill_ssdt, }; diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c index 0c893a44cb..c3e95e7506 100644 --- a/src/drivers/i2c/nau8825/nau8825.c +++ b/src/drivers/i2c/nau8825/nau8825.c @@ -86,8 +86,8 @@ static const char *nau8825_acpi_name(const struct device *dev) #endif static struct device_operations nau8825_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, #if CONFIG(HAVE_ACPI_TABLES) .acpi_name = nau8825_acpi_name, .acpi_fill_ssdt = nau8825_fill_ssdt, diff --git a/src/drivers/i2c/nct7802y/nct7802y.c b/src/drivers/i2c/nct7802y/nct7802y.c index c21b002ba5..dd8c0aabc0 100644 --- a/src/drivers/i2c/nct7802y/nct7802y.c +++ b/src/drivers/i2c/nct7802y/nct7802y.c @@ -20,8 +20,8 @@ static void nct7802y_init(struct device *const dev) } static struct device_operations nct7802y_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = nct7802y_init, }; diff --git a/src/drivers/i2c/pca9538/pca9538.c b/src/drivers/i2c/pca9538/pca9538.c index 68283b8006..b16ca48544 100644 --- a/src/drivers/i2c/pca9538/pca9538.c +++ b/src/drivers/i2c/pca9538/pca9538.c @@ -39,8 +39,8 @@ static void pca9538_init(struct device *dev) } static struct device_operations pca9538_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = pca9538_init, }; diff --git a/src/drivers/i2c/pcf8523/pcf8523.c b/src/drivers/i2c/pcf8523/pcf8523.c index 82945ffe2b..03b6b2269e 100644 --- a/src/drivers/i2c/pcf8523/pcf8523.c +++ b/src/drivers/i2c/pcf8523/pcf8523.c @@ -118,8 +118,8 @@ static void pcf8523_init(struct device *dev) } static struct device_operations pcf8523c_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = pcf8523_init, .final = pcf8523_final }; diff --git a/src/drivers/i2c/ptn3460/ptn3460.c b/src/drivers/i2c/ptn3460/ptn3460.c index 7b3bb56596..851156fea0 100644 --- a/src/drivers/i2c/ptn3460/ptn3460.c +++ b/src/drivers/i2c/ptn3460/ptn3460.c @@ -127,8 +127,8 @@ __weak int mb_adjust_cfg(struct ptn_3460_config *cfg_ptr) } static struct device_operations ptn3460_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = ptn3460_init, }; diff --git a/src/drivers/i2c/rt1011/rt1011.c b/src/drivers/i2c/rt1011/rt1011.c index 19ee1f2c22..68681ef846 100644 --- a/src/drivers/i2c/rt1011/rt1011.c +++ b/src/drivers/i2c/rt1011/rt1011.c @@ -84,8 +84,8 @@ static const char *rt1011_acpi_name(const struct device *dev) } static struct device_operations rt1011_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .acpi_name = rt1011_acpi_name, .acpi_fill_ssdt = rt1011_fill_ssdt, }; diff --git a/src/drivers/i2c/rt5663/rt5663.c b/src/drivers/i2c/rt5663/rt5663.c index 0e4bab03cc..70c14efc45 100644 --- a/src/drivers/i2c/rt5663/rt5663.c +++ b/src/drivers/i2c/rt5663/rt5663.c @@ -75,8 +75,8 @@ static const char *rt5663_acpi_name(const struct device *dev) } static struct device_operations rt5663_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .acpi_name = rt5663_acpi_name, .acpi_fill_ssdt = rt5663_fill_ssdt, }; diff --git a/src/drivers/i2c/rtd2132/rtd2132.c b/src/drivers/i2c/rtd2132/rtd2132.c index 5dffdc8000..74037ccee0 100644 --- a/src/drivers/i2c/rtd2132/rtd2132.c +++ b/src/drivers/i2c/rtd2132/rtd2132.c @@ -225,8 +225,8 @@ static void rtd2132_init(struct device *dev) } static struct device_operations rtd2132_operations = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = rtd2132_init, }; diff --git a/src/drivers/i2c/rx6110sa/rx6110sa.c b/src/drivers/i2c/rx6110sa/rx6110sa.c index c691965f9d..028058a7e7 100644 --- a/src/drivers/i2c/rx6110sa/rx6110sa.c +++ b/src/drivers/i2c/rx6110sa/rx6110sa.c @@ -165,8 +165,8 @@ static void rx6110sa_init(struct device *dev) } static struct device_operations rx6110sa_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = rx6110sa_init, .final = rx6110sa_final }; diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c index e1fe104fe8..a4fac10f60 100644 --- a/src/drivers/i2c/sx9310/sx9310.c +++ b/src/drivers/i2c/sx9310/sx9310.c @@ -79,8 +79,8 @@ static const char *i2c_sx9310_acpi_name(const struct device *dev) } static struct device_operations i2c_sx9310_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .acpi_name = i2c_sx9310_acpi_name, .acpi_fill_ssdt = i2c_sx9310_fill_ssdt, }; diff --git a/src/drivers/i2c/tpm/chip.c b/src/drivers/i2c/tpm/chip.c index eeccb7d30d..b81b0d17c8 100644 --- a/src/drivers/i2c/tpm/chip.c +++ b/src/drivers/i2c/tpm/chip.c @@ -62,8 +62,8 @@ static const char *i2c_tpm_acpi_name(const struct device *dev) } static struct device_operations i2c_tpm_ops = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .acpi_name = i2c_tpm_acpi_name, .acpi_fill_ssdt = i2c_tpm_fill_ssdt, }; diff --git a/src/drivers/i2c/w83793/w83793.c b/src/drivers/i2c/w83793/w83793.c index c52cbb24da..822c2cee21 100644 --- a/src/drivers/i2c/w83793/w83793.c +++ b/src/drivers/i2c/w83793/w83793.c @@ -292,8 +292,8 @@ static void w83793_init(struct device *dev) } static struct device_operations w83793_operations = { - .read_resources = DEVICE_NOOP, - .set_resources = DEVICE_NOOP, + .read_resources = noop_read_resources, + .set_resources = noop_set_resources, .init = w83793_init, }; -- cgit v1.2.3