Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: soc-dai.h: remove unused call back functions

Now, all drivers are using ops call backs.
Let's remove unused other call back functions.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87cyzx9m4o.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
446b31e8 2edc4a2c

-38
-13
include/sound/soc-dai.h
··· 414 414 struct snd_soc_dobj dobj; 415 415 struct of_phandle_args *dai_args; 416 416 417 - /* DAI driver callbacks */ 418 - int (*probe)(struct snd_soc_dai *dai); 419 - int (*remove)(struct snd_soc_dai *dai); 420 - /* compress dai */ 421 - int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num); 422 - /* Optional Callback used at pcm creation*/ 423 - int (*pcm_new)(struct snd_soc_pcm_runtime *rtd, 424 - struct snd_soc_dai *dai); 425 - 426 417 /* ops */ 427 418 const struct snd_soc_dai_ops *ops; 428 419 const struct snd_soc_cdai_ops *cops; ··· 424 433 unsigned int symmetric_rate:1; 425 434 unsigned int symmetric_channels:1; 426 435 unsigned int symmetric_sample_bits:1; 427 - 428 - /* probe ordering - for components with runtime dependencies */ 429 - int probe_order; 430 - int remove_order; 431 436 }; 432 437 433 438 /* for Playback/Capture */
-25
sound/soc/soc-core.c
··· 2510 2510 { 2511 2511 struct device *dev = component->dev; 2512 2512 struct snd_soc_dai *dai; 2513 - struct snd_soc_dai_ops *ops; /* REMOVE ME */ 2514 2513 2515 2514 lockdep_assert_held(&client_mutex); 2516 2515 ··· 2537 2538 } 2538 2539 if (!dai->name) 2539 2540 return NULL; 2540 - 2541 - /* REMOVE ME */ 2542 - if (dai_drv->probe || 2543 - dai_drv->remove || 2544 - dai_drv->compress_new || 2545 - dai_drv->pcm_new || 2546 - dai_drv->probe_order || 2547 - dai_drv->remove_order) { 2548 - 2549 - ops = devm_kzalloc(dev, sizeof(struct snd_soc_dai_ops), GFP_KERNEL); 2550 - if (!ops) 2551 - return NULL; 2552 - if (dai_drv->ops) 2553 - memcpy(ops, dai_drv->ops, sizeof(struct snd_soc_dai_ops)); 2554 - 2555 - ops->probe = dai_drv->probe; 2556 - ops->remove = dai_drv->remove; 2557 - ops->compress_new = dai_drv->compress_new; 2558 - ops->pcm_new = dai_drv->pcm_new; 2559 - ops->probe_order = dai_drv->probe_order; 2560 - ops->remove_order = dai_drv->remove_order; 2561 - 2562 - dai_drv->ops = ops; 2563 - } 2564 2541 2565 2542 dai->component = component; 2566 2543 dai->dev = dev;