Skip to content

Commit 317ec67

Browse files
morimotobroonie
authored andcommitted
ASoC: soc.h: convert bool to bit field for snd_soc_card
snd_soc_card has many bool, but it can be bit field. Signed-off-by: Kuninori Morimoto <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 6e28a0c commit 317ec67

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

include/sound/soc.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ struct snd_soc_dai_link {
820820
const struct snd_soc_compr_ops *compr_ops;
821821

822822
/* Mark this pcm with non atomic ops */
823-
bool nonatomic;
823+
unsigned int nonatomic:1;
824824

825825
/* For unidirectional dai links */
826826
unsigned int playback_only:1;
@@ -1016,9 +1016,6 @@ struct snd_soc_card {
10161016

10171017
spinlock_t dpcm_lock;
10181018

1019-
bool instantiated;
1020-
bool topology_shortname_created;
1021-
10221019
int (*probe)(struct snd_soc_card *card);
10231020
int (*late_probe)(struct snd_soc_card *card);
10241021
int (*remove)(struct snd_soc_card *card);
@@ -1079,8 +1076,6 @@ struct snd_soc_card {
10791076
int num_of_dapm_widgets;
10801077
const struct snd_soc_dapm_route *of_dapm_routes;
10811078
int num_of_dapm_routes;
1082-
bool fully_routed;
1083-
bool disable_route_checks;
10841079

10851080
/* lists of probed devices belonging to this card */
10861081
struct list_head component_dev_list;
@@ -1107,6 +1102,12 @@ struct snd_soc_card {
11071102
#endif
11081103
u32 pop_time;
11091104

1105+
/* bit field */
1106+
unsigned int instantiated:1;
1107+
unsigned int topology_shortname_created:1;
1108+
unsigned int fully_routed:1;
1109+
unsigned int disable_route_checks:1;
1110+
11101111
void *drvdata;
11111112
};
11121113
#define for_each_card_prelinks(card, i, link) \

0 commit comments

Comments
 (0)