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

Commit 9d0be76f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver update for 4.8-rc1.

  Not a lot of stuff, but it's all over the place, full details are in
  the shortlog.  All of these have been in linux-next with no reported
  issues for a while"

* tag 'char-misc-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (49 commits)
  lkdtm: silence warnings about function declarations
  lkdtm: hide unused functions
  intel_th: pci: Add Kaby Lake PCH-H support
  intel_th: Fix a deadlock in modprobing
  dsp56k: prevent a harmless underflow
  chardev: add missing line break in pr_warn
  lkdtm: use struct arrays instead of enums
  lkdtm: move jprobe entry points to start of source
  lkdtm: reorganize module paramaters
  lkdtm: rename globals for clarity
  lkdtm: rename "count" to "crash_count"
  lkdtm: remove intentional off-by-one array access
  lkdtm: split remaining logic bug tests to separate file
  lkdtm: split heap corruption tests to separate file
  lkdtm: split memory permissions tests to separate file
  lkdtm: split usercopy tests to separate file
  lkdtm: drop "alloc_size" parameter
  lkdtm: add usercopy test for blocking kernel text
  extcon: adc-jack: add suspend/resume support
  extcon: add missing of_node_put after calling of_parse_phandle
  ...
parents b403f230 45c7d71e

Documentation/devicetree/bindings/extcon/extcon-arizona.txt

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ Optional properties: 
    The second cell represents the MICBIAS to be used.

    The third cell represents the value of the micd-pol-gpio pin.



  - wlf,gpsw : Settings for the general purpose switch

  - wlf,gpsw : Settings for the general purpose switch, set as one of the

    ARIZONA_GPSW_XXX defines.



Example:

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6970,7 +6970,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git 
LINUX KERNEL DUMP TEST MODULE (LKDTM)

M:	Kees Cook <keescook@chromium.org>

S:	Maintained

F:	drivers/misc/lkdtm.c

F:	drivers/misc/lkdtm*



LLC (802.2)

M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

drivers/char/dsp56k.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd, 
			if(get_user(bin, &binary->bin) < 0)

				return -EFAULT;

		

			if (len == 0) {

			if (len <= 0) {

				return -EINVAL;      /* nothing to upload?!? */

			}

			if (len > DSP56K_MAX_BINARY_LENGTH) {

drivers/extcon/Makefile

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

#



obj-$(CONFIG_EXTCON)		+= extcon.o

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

extcon-core-objs		+= 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
+216 −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);

}



struct extcon_dev_notifier_devres {

	struct extcon_dev *edev;

	unsigned int id;

	struct notifier_block *nb;

};



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

{

	struct extcon_dev_notifier_devres *this = res;



	extcon_unregister_notifier(this->edev, this->id, this->nb);

}



/**

 * 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);



/**

 * devm_extcon_register_notifier() - Resource-managed extcon_register_notifier()

 * @dev:	device to allocate extcon device

 * @edev:	the extcon device that has the external connecotr.

 * @id:		the unique id of each external connector in extcon enumeration.

 * @nb:		a notifier block to be registered.

 *

 * This function manages automatically the notifier of extcon device using

 * device resource management and simplify the control of unregistering

 * the notifier of extcon device.

 *

 * Note that the second parameter given to the callback of nb (val) is

 * "old_state", not the current state. The current state can be retrieved

 * by looking at the third pameter (edev pointer)'s state value.

 *

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

 */

int devm_extcon_register_notifier(struct device *dev, struct extcon_dev *edev,

				unsigned int id, struct notifier_block *nb)

{

	struct extcon_dev_notifier_devres *ptr;

	int ret;



	ptr = devres_alloc(devm_extcon_dev_notifier_unreg, sizeof(*ptr),

				GFP_KERNEL);

	if (!ptr)

		return -ENOMEM;



	ret = extcon_register_notifier(edev, id, nb);

	if (ret) {

		devres_free(ptr);

		return ret;

	}



	ptr->edev = edev;

	ptr->id = id;

	ptr->nb = nb;

	devres_add(dev, ptr);



	return 0;

}

EXPORT_SYMBOL(devm_extcon_register_notifier);



/**

 * devm_extcon_unregister_notifier()

			- Resource-managed extcon_unregister_notifier()

 * @dev:	device to allocate extcon device

 * @edev:	the extcon device that has the external connecotr.

 * @id:		the unique id of each external connector in extcon enumeration.

 * @nb:		a notifier block to be registered.

 */

void devm_extcon_unregister_notifier(struct device *dev,

				struct extcon_dev *edev, unsigned int id,

				struct notifier_block *nb)

{

	WARN_ON(devres_release(dev, devm_extcon_dev_notifier_unreg,

			       devm_extcon_dev_match, edev));

}

EXPORT_SYMBOL(devm_extcon_unregister_notifier);