Could you move this sort of renaming/editing to a first patch? > /*Software Reset */ > -#define TAS2781_REG_SWRESET TASDEVICE_REG(0x0, 0X0, 0x01) > -#define TAS2781_REG_SWRESET_RESET BIT(0) > +#define TASDEVICE_REG_SWRESET TASDEVICE_REG(0x00, 0X00, 0x01) > +#define TASDEVICE_REG_SWRESET_RESET BIT(0) > -// tas2781-lib.c -- TAS2781 Common functions for HDA and ASoC Audio drivers > +// tas2781-comlib.c -- TAS2781 Common functions for HDA and ASoC Audio drivers > // > -// Copyright 2023 Texas Instruments, Inc. > +// Copyright 2023 - 2024 Texas Instruments, Inc. > @@ -254,8 +281,8 @@ void tas2781_reset(struct tasdevice_priv *tas_dev) > } else { > for (i = 0; i < tas_dev->ndev; i++) { > ret = tasdevice_dev_write(tas_dev, i, > - TAS2781_REG_SWRESET, > - TAS2781_REG_SWRESET_RESET); > + TASDEVICE_REG_SWRESET, > + TASDEVICE_REG_SWRESET_RESET); > @@ -591,8 +1470,8 @@ static const struct snd_soc_component_driver > soc_codec_driver_tasdevice = { > .probe = tasdevice_codec_probe, > .remove = tasdevice_codec_remove, > - .controls = tas2781_snd_controls, > - .num_controls = ARRAY_SIZE(tas2781_snd_controls), > + .controls = tasdevice_snd_controls, > + .num_controls = ARRAY_SIZE(tasdevice_snd_controls), > .dapm_widgets = tasdevice_dapm_widgets, > .num_dapm_widgets = ARRAY_SIZE(tasdevice_dapm_widgets), > .dapm_routes = tasdevice_audio_map, And then add functional changes in a second patch? It'd be simpler to review really...