leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update extcon next for v5.17

Browse Source 
Detailed description for this pull request:
 1. Remove duplicate code in extcon_set_state_sync() in extcon core
 2. Fix non-kernel-doc comment for extcon-usb-gpio.c
 -----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCgA0FiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmHFaOAWHGN3MDAuY2hv
 aUBzYW1zdW5nLmNvbQAKCRCczd8s3uvPU/sMD/9BPPoxUTV/he+qwRJb3AKGOgcx
 87WOU4j/psL0dJdevxyGLHa7m6x8a8SQZDom4xo//ZkriPizZqI36VpBSHAXkdU6
 LZhEs426aRTL9ZyP4TY2wHj7f8/DvEf3DZndWrorbMIVd0eIrz3zFNLAZNXpHHxY
 ZL/ljGPbTtcIdMb3k2PXiIJtU6JyfQXfN1cqXemF1vXLBgvVZzjVocG6fYyOnSo+
 4xfVStUBpk1h9CuJyvUZ+/VUr5D6SIiYFrzD73hLh0vsk2Et4GcZJEq0e3SS9155
 ycPWPVvhH+qzAWajKfwUkzORHDf/VBApzzV1qMLSmgbU50X56GRQ76xLto8ogGJe
 GhB3hg02iUvdEnDhspUXpxxB9knYQKu+L2UGC7m53EKU1moKZYvHmKdZuKIIoauW
 v1T7ou1oqbhYD/XM6B7rNXla3tzOy3WNgcs8XaDwRaqyz/A598ZcsUhnWo/Hx2vl
 ptVm/4CciderTuj1Z42aN/eruMGzOK3AsYOZKf4hd1zAl03ktC7OE+iWF7oLvMza
 Vz4B1uBMTVxjTUojNc1u9XR+2V7HM+2HUrEQNykvdttYAFLhiNzkNr4B+BU4N7HA
 mnG9fQLJCqvHPjhYc7IqvRpBaG77JbMiZtiqusjAHNANqn4zeABcMmMlYZ4PyI18
 LsHKHyj7BwgrDGQStQ==
 =HQLV
 -----END PGP SIGNATURE-----

Merge tag 'extcon-next-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon next for v5.17

Detailed description for this pull request:
1. Remove duplicate code in extcon_set_state_sync() in extcon core
2. Fix non-kernel-doc comment for extcon-usb-gpio.c

* tag 'extcon-next-for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: Deduplicate code in extcon_set_state_sync()
  extcon: usb-gpio: fix a non-kernel-doc comment
This commit is contained in:
Greg Kroah-Hartman 2021-12-27 10:27:01 +01:00
commit 372c73b469
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/extcon/extcon-usb-gpio.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
/**
/*
* drivers/extcon/extcon-usb-gpio.c - USB GPIO extcon driver
*
* Copyright (C) 2015 Texas Instruments Incorporated - https://www.ti.com

14
drivers/extcon/extcon.c
View File

@ -576,19 +576,7 @@ EXPORT_SYMBOL_GPL(extcon_set_state);
*/
int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id, bool state)
{
int ret, index;
unsigned long flags;
index = find_cable_index_by_id(edev, id);
if (index < 0)
return index;
/* Check whether the external connector's state is changed. */
spin_lock_irqsave(&edev->lock, flags);
ret = is_extcon_changed(edev, index, state);
spin_unlock_irqrestore(&edev->lock, flags);
if (!ret)
return 0;
int ret;
ret = extcon_set_state(edev, id, state);
if (ret < 0)