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

extcon: Split out the resource-managed functions from extcon core 



This patch split out the resource-managed related functions
from extcon core driver.

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

drivers/extcon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for external connector class (extcon) devices

#



obj-$(CONFIG_EXTCON)		+= extcon.o

obj-$(CONFIG_EXTCON)		+= extcon.o devres.o

obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o

obj-$(CONFIG_EXTCON_ARIZONA)	+= extcon-arizona.o

obj-$(CONFIG_EXTCON_AXP288)	+= extcon-axp288.o

drivers/extcon/devres.c

0 → 100644
+143 −0
Original line number Diff line number Diff line 
/*

 *  drivers/extcon/devres.c - EXTCON device's resource management

 *

 * Copyright (C) 2016 Samsung Electronics

 * Author: Chanwoo Choi <cw00.choi@samsung.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/extcon.h>



static int devm_extcon_dev_match(struct device *dev, void *res, void *data)

{

	struct extcon_dev **r = res;



	if (WARN_ON(!r || !*r))

		return 0;



	return *r == data;

}



static void devm_extcon_dev_release(struct device *dev, void *res)

{

	extcon_dev_free(*(struct extcon_dev **)res);

}





static void devm_extcon_dev_unreg(struct device *dev, void *res)

{

	extcon_dev_unregister(*(struct extcon_dev **)res);

}



/**

 * devm_extcon_dev_allocate - Allocate managed extcon device

 * @dev:		device owning the extcon device being created

 * @supported_cable:	Array of supported extcon ending with EXTCON_NONE.

 *			If supported_cable is NULL, cable name related APIs

 *			are disabled.

 *

 * This function manages automatically the memory of extcon device using device

 * resource management and simplify the control of freeing the memory of extcon

 * device.

 *

 * Returns the pointer memory of allocated extcon_dev if success

 * or ERR_PTR(err) if fail

 */

struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,

					const unsigned int *supported_cable)

{

	struct extcon_dev **ptr, *edev;



	ptr = devres_alloc(devm_extcon_dev_release, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return ERR_PTR(-ENOMEM);



	edev = extcon_dev_allocate(supported_cable);

	if (IS_ERR(edev)) {

		devres_free(ptr);

		return edev;

	}



	edev->dev.parent = dev;



	*ptr = edev;

	devres_add(dev, ptr);



	return edev;

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_allocate);



/**

 * devm_extcon_dev_free() - Resource-managed extcon_dev_unregister()

 * @dev:	device the extcon belongs to

 * @edev:	the extcon device to unregister

 *

 * Free the memory that is allocated with devm_extcon_dev_allocate()

 * function.

 */

void devm_extcon_dev_free(struct device *dev, struct extcon_dev *edev)

{

	WARN_ON(devres_release(dev, devm_extcon_dev_release,

			       devm_extcon_dev_match, edev));

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_free);



/**

 * devm_extcon_dev_register() - Resource-managed extcon_dev_register()

 * @dev:	device to allocate extcon device

 * @edev:	the new extcon device to register

 *

 * Managed extcon_dev_register() function. If extcon device is attached with

 * this function, that extcon device is automatically unregistered on driver

 * detach. Internally this function calls extcon_dev_register() function.

 * To get more information, refer that function.

 *

 * If extcon device is registered with this function and the device needs to be

 * unregistered separately, devm_extcon_dev_unregister() should be used.

 *

 * Returns 0 if success or negaive error number if failure.

 */

int devm_extcon_dev_register(struct device *dev, struct extcon_dev *edev)

{

	struct extcon_dev **ptr;

	int ret;



	ptr = devres_alloc(devm_extcon_dev_unreg, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return -ENOMEM;



	ret = extcon_dev_register(edev);

	if (ret) {

		devres_free(ptr);

		return ret;

	}



	*ptr = edev;

	devres_add(dev, ptr);



	return 0;

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_register);



/**

 * devm_extcon_dev_unregister() - Resource-managed extcon_dev_unregister()

 * @dev:	device the extcon belongs to

 * @edev:	the extcon device to unregister

 *

 * Unregister extcon device that is registered with devm_extcon_dev_register()

 * function.

 */

void devm_extcon_dev_unregister(struct device *dev, struct extcon_dev *edev)

{

	WARN_ON(devres_release(dev, devm_extcon_dev_unreg,

			       devm_extcon_dev_match, edev));

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_unregister);

drivers/extcon/extcon.c

+0 −117
Original line number Diff line number Diff line
@@ -564,66 +564,6 @@ void extcon_dev_free(struct extcon_dev *edev) 
}

EXPORT_SYMBOL_GPL(extcon_dev_free);



static int devm_extcon_dev_match(struct device *dev, void *res, void *data)

{

	struct extcon_dev **r = res;



	if (WARN_ON(!r || !*r))

		return 0;



	return *r == data;

}



static void devm_extcon_dev_release(struct device *dev, void *res)

{

	extcon_dev_free(*(struct extcon_dev **)res);

}



/**

 * devm_extcon_dev_allocate - Allocate managed extcon device

 * @dev:		device owning the extcon device being created

 * @supported_cable:	Array of supported extcon ending with EXTCON_NONE.

 *			If supported_cable is NULL, cable name related APIs

 *			are disabled.

 *

 * This function manages automatically the memory of extcon device using device

 * resource management and simplify the control of freeing the memory of extcon

 * device.

 *

 * Returns the pointer memory of allocated extcon_dev if success

 * or ERR_PTR(err) if fail

 */

struct extcon_dev *devm_extcon_dev_allocate(struct device *dev,

					const unsigned int *supported_cable)

{

	struct extcon_dev **ptr, *edev;



	ptr = devres_alloc(devm_extcon_dev_release, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return ERR_PTR(-ENOMEM);



	edev = extcon_dev_allocate(supported_cable);

	if (IS_ERR(edev)) {

		devres_free(ptr);

		return edev;

	}



	edev->dev.parent = dev;



	*ptr = edev;

	devres_add(dev, ptr);



	return edev;

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_allocate);



void devm_extcon_dev_free(struct device *dev, struct extcon_dev *edev)

{

	WARN_ON(devres_release(dev, devm_extcon_dev_release,

			       devm_extcon_dev_match, edev));

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_free);



/**

 * extcon_dev_register() - Register a new extcon device

 * @edev	: the new extcon device (should be allocated before calling)
@@ -889,63 +829,6 @@ void extcon_dev_unregister(struct extcon_dev *edev) 
}

EXPORT_SYMBOL_GPL(extcon_dev_unregister);



static void devm_extcon_dev_unreg(struct device *dev, void *res)

{

	extcon_dev_unregister(*(struct extcon_dev **)res);

}



/**

 * devm_extcon_dev_register() - Resource-managed extcon_dev_register()

 * @dev:	device to allocate extcon device

 * @edev:	the new extcon device to register

 *

 * Managed extcon_dev_register() function. If extcon device is attached with

 * this function, that extcon device is automatically unregistered on driver

 * detach. Internally this function calls extcon_dev_register() function.

 * To get more information, refer that function.

 *

 * If extcon device is registered with this function and the device needs to be

 * unregistered separately, devm_extcon_dev_unregister() should be used.

 *

 * Returns 0 if success or negaive error number if failure.

 */

int devm_extcon_dev_register(struct device *dev, struct extcon_dev *edev)

{

	struct extcon_dev **ptr;

	int ret;



	ptr = devres_alloc(devm_extcon_dev_unreg, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return -ENOMEM;



	ret = extcon_dev_register(edev);

	if (ret) {

		devres_free(ptr);

		return ret;

	}



	*ptr = edev;

	devres_add(dev, ptr);



	return 0;

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_register);



/**

 * devm_extcon_dev_unregister() - Resource-managed extcon_dev_unregister()

 * @dev:	device the extcon belongs to

 * @edev:	the extcon device to unregister

 *

 * Unregister extcon device that is registered with devm_extcon_dev_register()

 * function.

 */

void devm_extcon_dev_unregister(struct device *dev, struct extcon_dev *edev)

{

	WARN_ON(devres_release(dev, devm_extcon_dev_unreg,

			       devm_extcon_dev_match, edev));

}

EXPORT_SYMBOL_GPL(devm_extcon_dev_unregister);



#ifdef CONFIG_OF

/*

 * extcon_get_edev_by_phandle - Get the extcon device from devicetree

CRA Git | Maintained and supported by SUSTech CRA and CCSE