Commit 372c73b4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-5.17' of... 

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
parents 1bc4deed 2da3db7f

drivers/extcon/extcon-usb-gpio.c

+1 −1
Original line number Diff line number Diff line 
// 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

drivers/extcon/extcon.c

+1 −13
Original line number Diff line number Diff line
@@ -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)