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

Commit f8df8808 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Remove optional print_name() function pointer of extcon_dev 

This patch removes the optional print_name() function pointer included in
'struct extcon_dev' because the extcon must maintain the consistent name of
extcon device on sysfs instead of inconsistent name. After merged patch[1],
extcon can maintain the consistent name of extcon device without any hard-coded
device name.
[1] https://lkml.org/lkml/2015/4/27/258



Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 046050f6

drivers/extcon/extcon.c

+0 −8
Original line number Diff line number Diff line
@@ -207,14 +207,6 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, 
{

	struct extcon_dev *edev = dev_get_drvdata(dev);



	/* Optional callback given by the user */

	if (edev->print_name) {

		int ret = edev->print_name(edev, buf);



		if (ret >= 0)

			return ret;

	}



	return sprintf(buf, "%s\n", edev->name);

}

static DEVICE_ATTR_RO(name);

include/linux/extcon.h

+0 −3
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ struct extcon_cable; 
 *			be attached simulataneously. {0x7, 0} is equivalent to

 *			{0x3, 0x6, 0x5, 0}. If it is {0xFFFFFFFF, 0}, there

 *			can be no simultaneous connections.

 * @print_name:		An optional callback to override the method to print the

 *			name of the extcon device.

 * @print_state:	An optional callback to override the method to print the

 *			status of the extcon device.

 * @dev:		Device of this extcon.
@@ -111,7 +109,6 @@ struct extcon_dev { 
	const u32 *mutually_exclusive;



	/* Optional callbacks to override class functions */

	ssize_t	(*print_name)(struct extcon_dev *edev, char *buf);

	ssize_t	(*print_state)(struct extcon_dev *edev, char *buf);



	/* Internal data. Please do not set. */