Commit 562f0c67 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: firewire-motu: drop protocol structure 



Now protocol structure becomes useless. This commit drops it.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200519111641.123211-6-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ff222b7e

sound/firewire/motu/motu-protocol-v2.c

+0 −7
Original line number Diff line number Diff line
@@ -296,13 +296,9 @@ int snd_motu_protocol_v2_cache_packet_formats(struct snd_motu *motu) 
	return 0;

}



static const struct snd_motu_protocol snd_motu_protocol_v2 = {

};



const struct snd_motu_spec snd_motu_spec_828mk2 = {

	.name = "828mk2",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.protocol = &snd_motu_protocol_v2,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |
@@ -317,7 +313,6 @@ const struct snd_motu_spec snd_motu_spec_828mk2 = { 


const struct snd_motu_spec snd_motu_spec_traveler = {

	.name = "Traveler",

	.protocol = &snd_motu_protocol_v2,

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_SUPPORT_CLOCK_X4 |
@@ -334,7 +329,6 @@ const struct snd_motu_spec snd_motu_spec_traveler = { 
const struct snd_motu_spec snd_motu_spec_ultralite = {

	.name = "UltraLite",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.protocol = &snd_motu_protocol_v2,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK | // padding.

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |
@@ -348,7 +342,6 @@ const struct snd_motu_spec snd_motu_spec_ultralite = { 
const struct snd_motu_spec snd_motu_spec_8pre = {

	.name = "8pre",

	.protocol_version = SND_MOTU_PROTOCOL_V2,

	.protocol = &snd_motu_protocol_v2,

	// In tx, use coax chunks for mix-return 1/2. In rx, use coax chunks for

	// dummy 1/2.

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

sound/firewire/motu/motu-protocol-v3.c

+0 −5
Original line number Diff line number Diff line
@@ -310,13 +310,10 @@ int snd_motu_protocol_v3_cache_packet_formats(struct snd_motu *motu) 
	return 0;

}



static const struct snd_motu_protocol snd_motu_protocol_v3 = {

};



const struct snd_motu_spec snd_motu_spec_828mk3 = {

	.name = "828mk3",

	.protocol_version = SND_MOTU_PROTOCOL_V3,

	.protocol = &snd_motu_protocol_v3,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_SUPPORT_CLOCK_X4 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |
@@ -335,7 +332,6 @@ const struct snd_motu_spec snd_motu_spec_828mk3 = { 
const struct snd_motu_spec snd_motu_spec_audio_express = {

	.name = "AudioExpress",

	.protocol_version = SND_MOTU_PROTOCOL_V3,

	.protocol = &snd_motu_protocol_v3,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |
@@ -349,7 +345,6 @@ const struct snd_motu_spec snd_motu_spec_audio_express = { 
const struct snd_motu_spec snd_motu_spec_4pre = {

	.name = "4pre",

	.protocol_version = SND_MOTU_PROTOCOL_V3,

	.protocol = &snd_motu_protocol_v3,

	.flags = SND_MOTU_SPEC_SUPPORT_CLOCK_X2 |

		 SND_MOTU_SPEC_TX_MICINST_CHUNK |

		 SND_MOTU_SPEC_TX_RETURN_CHUNK |

sound/firewire/motu/motu.h

+0 −11
Original line number Diff line number Diff line
@@ -113,15 +113,6 @@ enum snd_motu_protocol_version { 
	SND_MOTU_PROTOCOL_V3,

};



struct snd_motu_protocol {

	int (*get_clock_rate)(struct snd_motu *motu, unsigned int *rate);

	int (*set_clock_rate)(struct snd_motu *motu, unsigned int rate);

	int (*get_clock_source)(struct snd_motu *motu,

				enum snd_motu_clock_source *source);

	int (*switch_fetching_mode)(struct snd_motu *motu, bool enable);

	int (*cache_packet_formats)(struct snd_motu *motu);

};



struct snd_motu_spec {

	const char *const name;

	enum snd_motu_protocol_version protocol_version;
@@ -129,8 +120,6 @@ struct snd_motu_spec { 


	unsigned char analog_in_ports;

	unsigned char analog_out_ports;



	const struct snd_motu_protocol *const protocol;

};



extern const struct snd_motu_spec snd_motu_spec_828mk2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE