Skip to content

Comments

ASoC: SOF: fixup the name of the new structs for IPC generic functionality by prefixing them with sof_#3415

Merged
ranj063 merged 26 commits intothesofproject:topic/sof-devfrom
ujfalusi:peter/sof/pr/fixup_ipc_ops_names_01
Feb 10, 2022
Merged

ASoC: SOF: fixup the name of the new structs for IPC generic functionality by prefixing them with sof_#3415
ranj063 merged 26 commits intothesofproject:topic/sof-devfrom
ujfalusi:peter/sof/pr/fixup_ipc_ops_names_01

Conversation

@ujfalusi
Copy link
Collaborator

@ujfalusi ujfalusi commented Feb 4, 2022

Hi,

It slipped through the review that we have missed to prefix the ops structs with a proper sof_ prefix.
We should have it right for upstream and we need a reminder which patches needs to be corrected.

Probably this is not the best way, but I went through all the patches and checked where the ops struct is used and added a fixup
specific to that patch. In Between the patches we will have non compiling code, which I don't like much, but when preparing for upstream and moving the fixes in position we will see how they broke and we are going to be forced to fix them up.

The other option would be to do separate patches for each struct, but it can not be a fixup anymore and the change needs to be done by hand when preparing things for sending out.
But, it will compile all the way.

I can swap to that if it is preferred..

@ujfalusi ujfalusi requested a review from ranj063 February 4, 2022 12:22
plbossart
plbossart previously approved these changes Feb 4, 2022
View reviewed changes
Copy link
Member

@plbossart plbossart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the changes look alright @ujfalusi

Another suggestion would be a set of reverts and redo, don't know if that would be easier. The main issue I have with fixups is that the bots will tell us the same issue for a while.

@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 4, 2022

@plbossart, true, I'm not going attempt it today, but that is not going to be easier either. I'll sleep on it over the weekend.

I'm tempted to do a name-by-name change and put a postit to the monitor to not forget this ;)

@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 9, 2022

@plbossart, @ranj063, any preference on how this should be done?

  1. this PR
  2. one patch per struct name
  3. one monster patch to change all

@ranj063
Copy link
Collaborator

ranj063 commented Feb 9, 2022

@plbossart, @ranj063, any preference on how this should be done?

  1. this PR
  2. one patch per struct name
  3. one monster patch to change all

I prefer this PR

ranj063
ranj063 previously approved these changes Feb 9, 2022
View reviewed changes
@plbossart
Copy link
Member

plbossart commented Feb 9, 2022

conflicts @ujfalusi ?

@ujfalusi
Fixup! ASoC: SOF: IPC: Introduce IPC ops
dd22c42 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: topology: Add helper function for processing tuple …
abb83dc 
…arrays

Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Introduce IPC3 ops
cb14a16 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: topology: Make route setup IPC agnostic
02e2b4d 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: topology: Make DAI widget parsing IPC agnostic
b8e0769 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: topology: Make control parsing IPC agnostic
ae6b5a6 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: topology: remove snd_sof_complete_pipeline()
7a75367 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Make sof_widget_setup/free IPC agnostic
c741c20 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Make sof_suspend/resume IPC agnostic
1d3117f 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Introduce IPC ops for kcontrol IO
33b3cd6 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add IPC3 topology control ops
cc2f717 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add volume_get/put IPC3 ops
ebf1d62 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add switch get/put IPC3 ops
146acdd 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add enum_get/put control ops for IPC3
e1b4030 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add bytes_get/put control IPC ops for IPC3
bd05a13 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add bytes_ext control IPC ops for IPC3
9035050 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Introduce IPC-specific PCM ops
4ebc12f 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Introduce IPC3 PCM hw_free op
61c1975 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add trigger PCM op for IPC3
5abf0d6 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add dai_link_fixup PCM op for IPC3
b1f7404 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: topology: Add ops for setting up and tearing down p…
8df62ad 
…ipelines

Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add a new dai_get_clk topology IPC op
e5fb9e6 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: ipc3: Implement rx_msg IPC ops
e56b01a 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: ipc: Separate the ops checks by functions/topics
b86a5da 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: ipc: Move the ipc_set_get_comp_data() local to ipc3…
be03c8c 
…-control

Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi
Fixup! ASoC: SOF: Add a new op to set up volume table
482e28f 
Add sof_ prefix for the ops struct names.

Note: breaks compilation and it will conflict when moved!!!

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
@ujfalusi ujfalusi dismissed stale reviews from ranj063 and plbossart via 482e28f February 10, 2022 09:48
@ujfalusi ujfalusi force-pushed the peter/sof/pr/fixup_ipc_ops_names_01 branch from f70e1a2 to 482e28f Compare February 10, 2022 09:48
@ujfalusi
Copy link
Collaborator Author

ujfalusi commented Feb 10, 2022

Changes since v1:

  • rebased on sof-dev
    • new fixup for the "ASoC: SOF: Add a new op to set up volume table" which caused the conflict.

@ranj063 ranj063 merged commit f1e2b3b into thesofproject:topic/sof-dev Feb 10, 2022
@ujfalusi ujfalusi deleted the peter/sof/pr/fixup_ipc_ops_names_01 branch November 18, 2022 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@plbossart plbossart plbossart approved these changes

@ranj063 ranj063 ranj063 approved these changes

@ajitkupandey ajitkupandey Awaiting requested review from ajitkupandey

@bardliao bardliao Awaiting requested review from bardliao bardliao is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@juimonen juimonen Awaiting requested review from juimonen

@keyonjie keyonjie Awaiting requested review from keyonjie

@kuanhsuncheng kuanhsuncheng Awaiting requested review from kuanhsuncheng

@kv2019i kv2019i Awaiting requested review from kv2019i kv2019i is a code owner

@lgirdwood lgirdwood Awaiting requested review from lgirdwood lgirdwood is a code owner

@libinyang libinyang Awaiting requested review from libinyang

@lyakh lyakh Awaiting requested review from lyakh lyakh is a code owner

@RanderWang RanderWang Awaiting requested review from RanderWang

@singalsu singalsu Awaiting requested review from singalsu

@yaochunhung yaochunhung Awaiting requested review from yaochunhung

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ujfalusi @ranj063 @plbossart