Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 575c2b86 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Rename the extcon_set/get_state() to maintain the function naming pattern 



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: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarChris Zhong <zyw@rock-chips.com>
Tested-by: default avatarGuenter Roeck <groeck@chromium.org>
Reviewed-by: default avatarGuenter Roeck <groeck@chromium.org>
parent 7f2a0a16

drivers/extcon/extcon.c

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

include/linux/extcon.h

+18 −7
Original line number Diff line number Diff line
@@ -216,11 +216,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);



/*
@@ -305,14 +305,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;

}
@@ -402,4 +402,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__ */