Browse Source

ASoC: msm: add machine drv as apr child node

Automotive machine driver is a child node of apr
so it will be re-probed upon ADSP UP event received
in APR driver during boot up.
Remove the dummy machine driver solution.

Change-Id: I9ac3e26366a5b01869183e8b83e47049ec770c7c
Signed-off-by: Derek Chen <[email protected]>
Derek Chen 6 years ago
parent
commit
609be4509a
1 changed files with 1 additions and 25 deletions
  1. 1 25
      asoc/sa8155.c

+ 1 - 25
asoc/sa8155.c

@@ -7141,29 +7141,6 @@ static struct platform_driver sa8155_asoc_machine_driver = {
 	.remove = msm_asoc_machine_remove,
 };
 
-static int dummy_asoc_machine_probe(struct platform_device *pdev)
-{
-	return 0;
-}
-
-static int dummy_asoc_machine_remove(struct platform_device *pdev)
-{
-	return 0;
-}
-
-static struct platform_device sa8155_dummy_asoc_machine_device = {
-	.name = "sa8155-asoc-snd-dummy",
-};
-
-static struct platform_driver sa8155_dummy_asoc_machine_driver = {
-	.driver = {
-		.name = "sa8155-asoc-snd-dummy",
-		.owner = THIS_MODULE,
-	},
-	.probe = dummy_asoc_machine_probe,
-	.remove = dummy_asoc_machine_remove,
-};
-
 static int sa8155_notifier_service_cb(struct notifier_block *this,
 					 unsigned long opcode, void *ptr)
 {
@@ -7186,9 +7163,8 @@ static int sa8155_notifier_service_cb(struct notifier_block *this,
 		break;
 	case AUDIO_NOTIFIER_SERVICE_UP:
 		if (is_initial_boot) {
-			platform_driver_register(&sa8155_dummy_asoc_machine_driver);
-			platform_device_register(&sa8155_dummy_asoc_machine_device);
 			is_initial_boot = false;
+			break;
 		}
 		if (!spdev)
 			return -EINVAL;