Merge tag 'for-torvalds-20120418' of... (3b422e9c) · Commits · 戴 / test

drivers/pinctrl/core.c

+21 −4

Original line number	Diff line number	Diff line
		@@ -908,10 +908,6 @@ static int pinctrl_groups_show(struct seq_file s, void what)
		const struct pinctrl_ops *ops = pctldev->desc->pctlops;
		unsigned selector = 0;

		/* No grouping */
		if (!ops)
		return 0;

		mutex_lock(&pinctrl_mutex);

		seq_puts(s, "registered pin groups:\n");
		@@ -1225,6 +1221,19 @@ static void pinctrl_remove_device_debugfs(struct pinctrl_dev *pctldev)

		#endif

		static int pinctrl_check_ops(struct pinctrl_dev *pctldev)
		{
		const struct pinctrl_ops *ops = pctldev->desc->pctlops;

		if (!ops \|\|
		!ops->list_groups \|\|
		!ops->get_group_name \|\|
		!ops->get_group_pins)
		return -EINVAL;

		return 0;
		}

		/**
		* pinctrl_register() - register a pin controller device
		* @pctldesc: descriptor for this pin controller
		@@ -1256,6 +1265,14 @@ struct pinctrl_dev pinctrl_register(struct pinctrl_desc pctldesc,
		INIT_LIST_HEAD(&pctldev->gpio_ranges);
		pctldev->dev = dev;

		/* check core ops for sanity */
		ret = pinctrl_check_ops(pctldev);
		if (ret) {
		pr_err("%s pinctrl ops lacks necessary functions\n",
		pctldesc->name);
		goto out_err;
		}

		/* If we're implementing pinmuxing, check the ops for sanity */
		if (pctldesc->pmxops) {
		ret = pinmux_check_ops(pctldev);

+3 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@
		#ifndef __LINUX_PINCTRL_MACHINE_H
		#define __LINUX_PINCTRL_MACHINE_H

		#include <linux/bug.h>

		#include "pinctrl-state.h"

		enum pinctrl_map_type {
		@@ -148,7 +150,7 @@ struct pinctrl_map {
		#define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \
		PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)

		#ifdef CONFIG_PINMUX
		#ifdef CONFIG_PINCTRL

		extern int pinctrl_register_mappings(struct pinctrl_map const *map,
		unsigned num_maps);