[PATCH 00/14] ASoC: rt: Drop unused GPIO includes
These drivers include legacy GPIO headers for no reason at all, so get rid of the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- Linus Walleij (14): ASoC: rt1011: Drop GPIO includes ASoC: rt1015: Drop GPIO include ASoC: rt1015p: Drop legacy GPIO include ASoC: rt1016: Drop GPIO include ASoC: rt1019: Drop GPIO include ASoC: rt1305: Drop GPIO includes ASoC: rt1308: Drop GPIO includes ASoC: rt5514-spi: Drop GPIO include ASoC: rt5514: Drop GPIO include ASoC: rt5645: Drop legacy GPIO include ASoC: rt5659: Drop legacy GPIO include ASoC: rt5660: Drop GPIO includes ASoC: rt5682-sdw: Drop GPIO includes ASoC: rt715: Drop GPIO includes
sound/soc/codecs/rt1011.c | 2 -- sound/soc/codecs/rt1015.c | 1 - sound/soc/codecs/rt1015p.c | 1 - sound/soc/codecs/rt1016.c | 1 - sound/soc/codecs/rt1019.c | 1 - sound/soc/codecs/rt1305.c | 2 -- sound/soc/codecs/rt1308.c | 2 -- sound/soc/codecs/rt5514-spi.c | 1 - sound/soc/codecs/rt5514.c | 1 - sound/soc/codecs/rt5645.c | 1 - sound/soc/codecs/rt5659.c | 1 - sound/soc/codecs/rt5660.c | 2 -- sound/soc/codecs/rt5682-sdw.c | 2 -- sound/soc/codecs/rt715.c | 3 --- 14 files changed, 21 deletions(-) --- base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 change-id: 20230811-descriptors-asoc-221835f35f32
Best regards,
This driver include two GPIO legacy headers yet doesn't use symbols from any of them. Drop the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1011.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 42bac8150f62..d5285baad53a 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -13,11 +13,9 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/pm.h> -#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/acpi.h> #include <linux/regmap.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/firmware.h> #include <sound/core.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. Drop the include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1015.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt1015.c b/sound/soc/codecs/rt1015.c index 38d9f69b08d6..99ec0f9a8362 100644 --- a/sound/soc/codecs/rt1015.c +++ b/sound/soc/codecs/rt1015.c @@ -12,7 +12,6 @@ #include <linux/delay.h> #include <linux/firmware.h> #include <linux/fs.h> -#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/init.h> #include <linux/module.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. It is using the new consumer include <linux/gpio/consumer.h> already. Drop the surplus include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1015p.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt1015p.c b/sound/soc/codecs/rt1015p.c index 06800dad8798..44e7fe3c32da 100644 --- a/sound/soc/codecs/rt1015p.c +++ b/sound/soc/codecs/rt1015p.c @@ -8,7 +8,6 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/kernel.h> #include <linux/module.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. Drop the include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1016.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt1016.c b/sound/soc/codecs/rt1016.c index b1e69fa290b2..919a1f25e584 100644 --- a/sound/soc/codecs/rt1016.c +++ b/sound/soc/codecs/rt1016.c @@ -16,7 +16,6 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/firmware.h> -#include <linux/gpio.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. Drop the include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1019.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt1019.c b/sound/soc/codecs/rt1019.c index fd55049920c1..ceb8baa6a20d 100644 --- a/sound/soc/codecs/rt1019.c +++ b/sound/soc/codecs/rt1019.c @@ -18,7 +18,6 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/firmware.h> -#include <linux/gpio.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h>
This driver include two GPIO legacy headers yet doesn't use symbols from any of them. Drop the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1305.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/codecs/rt1305.c b/sound/soc/codecs/rt1305.c index 59895131e6e0..80888cbcf49c 100644 --- a/sound/soc/codecs/rt1305.c +++ b/sound/soc/codecs/rt1305.c @@ -12,10 +12,8 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/acpi.h> -#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/regmap.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/firmware.h> #include <sound/core.h>
This driver include two GPIO legacy headers yet doesn't use symbols from any of them. Drop the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt1308.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/codecs/rt1308.c b/sound/soc/codecs/rt1308.c index 9d07756cda40..86afb429d423 100644 --- a/sound/soc/codecs/rt1308.c +++ b/sound/soc/codecs/rt1308.c @@ -11,10 +11,8 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/pm.h> -#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/regmap.h> -#include <linux/of_gpio.h> #include <linux/acpi.h> #include <linux/platform_device.h> #include <linux/firmware.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. Drop the include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt5514-spi.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 362663abcb89..3ee6d85268ba 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -15,7 +15,6 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/slab.h> -#include <linux/gpio.h> #include <linux/sched.h> #include <linux/uaccess.h> #include <linux/regulator/consumer.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. Drop the include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt5514.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c index b3aac2373357..43fc7814fdde 100644 --- a/sound/soc/codecs/rt5514.c +++ b/sound/soc/codecs/rt5514.c @@ -17,7 +17,6 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/firmware.h> -#include <linux/gpio.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. It is using the new consumer include <linux/gpio/consumer.h> already. Drop the surplus include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt5645.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index acc7fb1581b2..1a28fb541255 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -14,7 +14,6 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/spi/spi.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <linux/acpi.h> #include <linux/dmi.h>
This driver include the GPIO legacy header <linux/gpio.h> yet doesn't use symbols from it. It is using the new consumer include <linux/gpio/consumer.h> already. Drop the surplus include.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt5659.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index df6f0d769bbd..a061028a16d8 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -16,7 +16,6 @@ #include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/acpi.h> -#include <linux/gpio.h> #include <linux/gpio/consumer.h> #include <sound/core.h> #include <sound/pcm.h>
This driver include two GPIO legacy headers yet doesn't use symbols from any of them. Drop the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt5660.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/codecs/rt5660.c b/sound/soc/codecs/rt5660.c index eade087b2d8b..0cecfd602415 100644 --- a/sound/soc/codecs/rt5660.c +++ b/sound/soc/codecs/rt5660.c @@ -11,11 +11,9 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/pm.h> -#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/regmap.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/acpi.h>
This driver include two GPIO legacy headers yet doesn't use symbols from any of them. Drop the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt5682-sdw.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index 67404f45389f..3d13ea74b074 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -12,8 +12,6 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/acpi.h> -#include <linux/gpio.h> -#include <linux/of_gpio.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/mutex.h>
This driver include two GPIO legacy headers and one contemporary, yet doesn't use symbols from any of them. Drop the includes.
Signed-off-by: Linus Walleij linus.walleij@linaro.org --- sound/soc/codecs/rt715.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index 6c2e165dd621..1c70fa2d3e5b 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -16,14 +16,11 @@ #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> -#include <linux/gpio.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> -#include <linux/gpio/consumer.h> #include <linux/of.h> -#include <linux/of_gpio.h> #include <linux/of_device.h> #include <sound/core.h> #include <sound/pcm.h>
On Sat, 12 Aug 2023 21:56:38 +0200, Linus Walleij wrote:
These drivers include legacy GPIO headers for no reason at all, so get rid of the includes.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/14] ASoC: rt1011: Drop GPIO includes commit: a5c8e75b34fa0d399e8e6b304de3bad4d9e41a3a [02/14] ASoC: rt1015: Drop GPIO include commit: c7a7f4444b1fd648edc3fb54f2d3822215b46c56 [03/14] ASoC: rt1015p: Drop legacy GPIO include commit: 3abc7076851f63c5d193ee9d942554f182527d18 [04/14] ASoC: rt1016: Drop GPIO include commit: 8a5a8015b1e23e41204738f2147c01bf18039965 [05/14] ASoC: rt1019: Drop GPIO include commit: e04cbe53205ecfcb1f2a8314dfc829ebbcb542f1 [06/14] ASoC: rt1305: Drop GPIO includes commit: ba55dde45b5a5595763af6d06066ab789792e9d3 [07/14] ASoC: rt1308: Drop GPIO includes commit: f36c684e9941b3af6769b984239f62dc9fe99698 [08/14] ASoC: rt5514-spi: Drop GPIO include commit: 12ffd88e398cb82f960da25ab990a6864641fee1 [09/14] ASoC: rt5514: Drop GPIO include commit: 9fdc4feacdb0a5b3a49d611aff88371f8f8d4971 [10/14] ASoC: rt5645: Drop legacy GPIO include commit: 92f1b48277f2fdaa9649630dc9a8ec298bfd6def [11/14] ASoC: rt5659: Drop legacy GPIO include commit: 0b759f3b3faa51022752bc4a99ae1af57baf344f [12/14] ASoC: rt5660: Drop GPIO includes commit: b72a4dc2bede787221a4b1b2e3860f6725f109b5 [13/14] ASoC: rt5682-sdw: Drop GPIO includes commit: 1a625a7a5d74be6b367301e6eb9e38d35797313a [14/14] ASoC: rt715: Drop GPIO includes commit: 797df2a670c336500cdea482f404a24b45b28f45
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (2)
-
Linus Walleij -
Mark Brown