From db56317667babb3d196d031ba0aacbeeca8f322a Mon Sep 17 00:00:00 2001 From: Karthikeyan Mani Date: Tue, 4 Apr 2017 14:09:09 -0700 Subject: soundwire: Move device init functionality from master Move from master probe to the slave probe, the device init functionality of swr slave. Provide device remove functionality to remove a given device from the master's list. CRs-fixed: 2050710 Change-Id: Iee95c146d8b148e15dca5a8c10de65368cf3b55a Signed-off-by: Karthikeyan Mani --- include/linux/soundwire/soundwire.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/soundwire/soundwire.h b/include/linux/soundwire/soundwire.h index 2083e7b5da25..c3b95eeb37e5 100755 --- a/include/linux/soundwire/soundwire.h +++ b/include/linux/soundwire/soundwire.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -309,4 +309,6 @@ extern int swr_reset_device(struct swr_device *swr_dev); extern int swr_slvdev_datapath_control(struct swr_device *swr_dev, u8 dev_num, bool enable); extern int swr_remove_from_group(struct swr_device *dev, u8 dev_num); + +extern void swr_remove_device(struct swr_device *swr_dev); #endif /* _LINUX_SOUNDWIRE_H */ -- cgit v1.2.3 From a9f9dadb78e884b4f8649f23900aabb64f17a761 Mon Sep 17 00:00:00 2001 From: Karthikeyan Mani Date: Thu, 20 Apr 2017 17:06:10 -0700 Subject: soundwire: Remove startup from swr_driver structure Remove the startup function declaration from struct swr_driver as it has been removed as part of moving soundwire device functionality from swrm master probe to the swr device probe. CRs-fixed: 2050710 Change-Id: I2c0a38c609f87c432e3cd29694caf1d2f1a272e2 Signed-off-by: Karthikeyan Mani --- include/linux/soundwire/soundwire.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/linux') diff --git a/include/linux/soundwire/soundwire.h b/include/linux/soundwire/soundwire.h index c3b95eeb37e5..1287d2b73bf8 100755 --- a/include/linux/soundwire/soundwire.h +++ b/include/linux/soundwire/soundwire.h @@ -196,7 +196,6 @@ static inline struct swr_device *to_swr_device(struct device *dev) * @shutdown: standard shutdown callback used during power down/halt * @suspend: standard suspend callback used during system suspend * @resume: standard resume callback used during system resume - * @startup: additional init operation for slave devices * @driver: soundwire device drivers should initialize name and * owner field of this structure * @id_table: list of soundwire devices supported by this driver @@ -210,7 +209,6 @@ struct swr_driver { int (*device_up)(struct swr_device *swr); int (*device_down)(struct swr_device *swr); int (*reset_device)(struct swr_device *swr); - int (*startup)(struct swr_device *swr); struct device_driver driver; const struct swr_device_id *id_table; }; -- cgit v1.2.3