From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529AbcHAFvh (ORCPT ); Mon, 1 Aug 2016 01:51:37 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:36846 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750821AbcHAFvE (ORCPT ); Mon, 1 Aug 2016 01:51:04 -0400 X-AuditID: cbfee68e-f79cb6d000006cfe-50-579ee343604b From: Chanwoo Choi To: linux-kernel@vger.kernel.org Cc: cw00.choi@samsung.com, myungjoo.ham@samsung.com, zyw@rock-chips.com, groeck@chromium.org, chanwoo@kernel.org Subject: [PATCH v2 4/6] extcon: Rename the extcon_set/get_state() to maintain the function naming pattern Date: Mon, 01 Aug 2016 14:50:52 +0900 Message-id: <1470030654-6641-5-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1470030654-6641-1-git-send-email-cw00.choi@samsung.com> References: <1470030654-6641-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRmVeSWpSXmKPExsWyRsSkQNf58bxwgx97uSwm3rjCYnH9y3NW i1OvljFbXN41h83iduMKNov5D3YwO7B5zG64yOKxaVUnm8ffWftZPPq2rGL0+LxJLoA1issm JTUnsyy1SN8ugSvj5JefbAUXtCt+fxJuYPyo3MXIySEhYCLx4eIFRghbTOLCvfVsXYxcHEIC Kxgltu1cxwhTtOj6LlaIxFJGidOPZ7BDOF8YJfYtW8AEUsUmoCWx/8UNNhBbREBBYnPvM1YQ m1mgSGL+6dfMXYwcHMIC2RIvHomDhFkEVCVm9z8Ga+UVcJHo3zaTFWKZnMSHPY/YQWxOAVeJ Z3u7WEBsIaCaU1tWM4HslRCYzC6xctUydohBAhLfJh9iAZkvISArsekAM8QcSYmDK26wTGAU XsDIsIpRNLUguaA4Kb3ISK84Mbe4NC9dLzk/dxMjMLRP/3vWt4Px5gHrQ4wCHIxKPLwcTPPC hVgTy4orcw8xmgJtmMgsJZqcD4ygvJJ4Q2MzIwtTE1NjI3NLMyVx3gSpn8FCAumJJanZqakF qUXxRaU5qcWHGJk4OKUaGBPbZHO752Z/Eu71FWYryX6krcd6fNP9ozG9k/QUv/LOevHJubvo bfsXHWW7lPlCeu0rqq4vTe5n7nua/v/n/MwA90MaUxlLzdxKhbasVy08evFc3pXoqEKt4zZb 792etCchKTvvQZfL448i7x6pfjA3WLTX6OlWg3OBL5eocT4sfPlRPU7JSomlOCPRUIu5qDgR AKfscyVoAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRmVeSWpSXmKPExsVy+t9jAV3nx/PCDWZeZLGYeOMKi8X1L89Z LU69WsZscXnXHDaL240r2CzmP9jB7MDmMbvhIovHplWdbB5/Z+1n8ejbsorR4/MmuQDWqAZG m4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zBygE5QUyhJz SoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhDWMGSe//GQruKBd8fuTcAPjR+UuRk4O CQETiUXXd7FC2GISF+6tZ+ti5OIQEljKKHH68Qx2COcLo8S+ZQuYQKrYBLQk9r+4wQZiiwgo SGzufQbWzSxQJDH/9GvmLkYODmGBbIkXj8RBwiwCqhKz+x+DtfIKuEj0b5sJtUxO4sOeR+wg NqeAq8SzvV0sILYQUM2pLauZJjDyLmBkWMUokVqQXFCclJ5rmJdarlecmFtcmpeul5yfu4kR HD/PpHYwHtzlfohRgINRiYc3wX9euBBrYllxZe4hRgkOZiUR3o8PgUK8KYmVValF+fFFpTmp xYcYTYEOm8gsJZqcD4ztvJJ4Q2MTMyNLI3NDCyNjcyVx3sf/14UJCaQnlqRmp6YWpBbB9DFx cEo1MM6osV4Vdv7irnOCZc0KDK0hkVfuKr79ELeg4cWHdMub67eWHrhpGGx4LuLkaoaY8Feh Vpydz4SXzpWOtM9xmpJ87VzIvo6Oq58VQ6w8DnnGvqyIqlL++337uT97midkZy965RvEWqhx LPO5Zs7u+a82Zl7fb21Q5J7c9zy1qqmFzY3v3D3p00osxRmJhlrMRcWJAMjYj221AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch just renames the existing extcon_get/set_cable_state_() as following because of maintaining the function naming pattern like as extcon APIs for property. - extcon_set_cable_state_() -> extcon_set_state() - extcon_get_cable_state_() -> extcon_get_state() But, this patch remains the old extcon_set/get_cable_state_() functions to prevent the build break. After altering new APIs, remove the old APIs. Signed-off-by: Chanwoo Choi Tested-by: Chris Zhong --- drivers/extcon/extcon.c | 28 +++++++++++++--------------- include/linux/extcon.h | 25 ++++++++++++++++++------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index 10b201b161ac..207143347fb7 100644 --- a/drivers/extcon/extcon.c +++ b/drivers/extcon/extcon.c @@ -398,8 +398,7 @@ static ssize_t cable_state_show(struct device *dev, int i = cable->cable_index; return sprintf(buf, "%d\n", - extcon_get_cable_state_(cable->edev, - cable->edev->supported_cable[i])); + extcon_get_state(cable->edev, cable->edev->supported_cable[i])); } /** @@ -495,13 +494,14 @@ static int extcon_update_state(struct extcon_dev *edev, u32 mask, u32 state) } /** - * extcon_get_cable_state_() - Get the status of a specific cable. + * extcon_get_state() - Get the state of a external connector. * @edev: the extcon device that has the cable. * @id: the unique id of each external connector in extcon enumeration. */ -int extcon_get_cable_state_(struct extcon_dev *edev, const unsigned int id) +int extcon_get_state(struct extcon_dev *edev, const unsigned int id) { - int index; + int index, state; + unsigned long flags; if (!edev) return -EINVAL; @@ -510,22 +510,23 @@ int extcon_get_cable_state_(struct extcon_dev *edev, const unsigned int id) if (index < 0) return index; - if (edev->max_supported && edev->max_supported <= index) - return -EINVAL; + spin_lock_irqsave(&edev->lock, flags); + state = is_extcon_attached(edev, index); + spin_unlock_irqrestore(&edev->lock, flags); - return (int)(is_extcon_attached(edev, index)); + return state; } -EXPORT_SYMBOL_GPL(extcon_get_cable_state_); +EXPORT_SYMBOL_GPL(extcon_get_state); /** - * extcon_set_cable_state_() - Set the status of a specific cable. + * extcon_set_state() - Set the state of a external connector. * @edev: the extcon device that has the cable. * @id: the unique id of each external connector * in extcon enumeration. * @state: the new cable status. The default semantics is * true: attached / false: detached. */ -int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id, +int extcon_set_state(struct extcon_dev *edev, unsigned int id, bool cable_state) { u32 state; @@ -538,9 +539,6 @@ int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id, if (index < 0) return index; - if (edev->max_supported && edev->max_supported <= index) - return -EINVAL; - /* * Initialize the value of extcon property before setting * the detached state for an external connector. @@ -551,7 +549,7 @@ int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id, state = cable_state ? (1 << index) : 0; return extcon_update_state(edev, 1 << index, state); } -EXPORT_SYMBOL_GPL(extcon_set_cable_state_); +EXPORT_SYMBOL_GPL(extcon_set_state); /** * extcon_get_property() - Get the property value of a specific cable. diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 80b740d81b1f..a38a42418195 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -221,11 +221,11 @@ extern struct extcon_dev *devm_extcon_dev_allocate(struct device *dev, extern void devm_extcon_dev_free(struct device *dev, struct extcon_dev *edev); /* - * get/set_cable_state access each bit of the 32b encoded state value. + * get/set_state access each bit of the 32b encoded state value. * They are used to access the status of each cable based on the cable id. */ -extern int extcon_get_cable_state_(struct extcon_dev *edev, unsigned int id); -extern int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id, +extern int extcon_get_state(struct extcon_dev *edev, unsigned int id); +extern int extcon_set_state(struct extcon_dev *edev, unsigned int id, bool cable_state); /* @@ -310,14 +310,14 @@ static inline struct extcon_dev *devm_extcon_dev_allocate(struct device *dev, static inline void devm_extcon_dev_free(struct extcon_dev *edev) { } -static inline int extcon_get_cable_state_(struct extcon_dev *edev, - unsigned int id) + +static inline int extcon_get_state(struct extcon_dev *edev, unsigned int id) { return 0; } -static inline int extcon_set_cable_state_(struct extcon_dev *edev, - unsigned int id, bool cable_state) +static inline int extcon_set_state(struct extcon_dev *edev, unsigned int id, + bool cable_state) { return 0; } @@ -407,4 +407,15 @@ static inline int extcon_unregister_interest(struct extcon_specific_cable_nb { return -EINVAL; } + +static inline int extcon_get_cable_state_(struct extcon_dev *edev, unsigned int id) +{ + return extcon_get_state(edev, id); +} + +static inline int extcon_set_cable_state_(struct extcon_dev *edev, unsigned int id, + bool cable_state) +{ + return extcon_set_state(edev, id, cable_state); +} #endif /* __LINUX_EXTCON_H__ */ -- 1.9.1