pinctrl: delete raw device pointers in pinmux maps

After discussion with Mark Brown in an unrelated thread about ADC lookups, it came to my knowledge that the ability to pass a struct device * in the regulator consumers is just a historical artifact, and not really recommended. Since there are no in-kernel users of these pointers, we just kill them right now, before someone starts to use them.

Linus Walleij committed 14 years ago

Commit 9dfac4f1 parent 8dc6ae46 files · +23 −54Browse files

Unified · Split

6 files

Documentation/pinctrl.txt +1 −4
drivers/pinctrl/core.c +7 −15
drivers/pinctrl/core.h +1 −2
drivers/pinctrl/pinconf.c +4 −4
drivers/pinctrl/pinmux.c +8 −19
include/linux/pinctrl/machine.h +2 −10

Documentation/pinctrl.txt+1−4

@@ -805,10 +805,7 @@ must match a function provided by the pinmux driver handling this pin range. · 804 unmodified lines
805		805
806	As you can see we may have several pin controllers on the system and thus	806	As you can see we may have several pin controllers on the system and thus
807	we need to specify which one of them that contain the functions we wish	807	we need to specify which one of them that contain the functions we wish
808	to map. The map can also use struct device * directly, so there is no	808	to map.
809	inherent need to use strings to specify .dev_name or .ctrl_dev_name, these
810	are for the situation where you do not have a handle to the struct device *,
811	for example if they are not yet instantiated or cumbersome to obtain.
812		809
813	You register this pinmux mapping to the pinmux subsystem by simply:	810	You register this pinmux mapping to the pinmux subsystem by simply:
814		811

drivers/pinctrl/core.c+7−15

 EXPORT_SYMBOL_GPL(pinctrl_dev_get_drvdata);
 /**
- * get_pinctrl_dev_from_dev() - look up pin controller device
+ * get_pinctrl_dev_from_devname() - look up pin controller device
- * @dev: a device pointer, this may be NULL but then devname needs to be
+ * @devname: the name of a device instance, as returned by dev_name()
- *	defined instead
- * @devname: the name of a device instance, as returned by dev_name(), this
- *	may be NULL but then dev needs to be defined instead
  *
  * Looks up a pin control device matching a certain device name or pure device
  * pointer, the pure device pointer will take precedence.
  */
-struct pinctrl_dev *get_pinctrl_dev_from_dev(struct device *dev,
+struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *devname)
-					     const char *devname)
 {
 	struct pinctrl_dev *pctldev = NULL;
 	bool found = false;
+	if (!devname)
+		return NULL;
 	mutex_lock(&pinctrldev_list_mutex);
 	list_for_each_entry(pctldev, &pinctrldev_list, node) {
-		if (dev && pctldev->dev == dev) {
+		if (!strcmp(dev_name(pctldev->dev), devname)) {
-			/* Matched on device pointer */
-			found = true;
-			break;
-		}
-		if (devname &&
-		    !strcmp(dev_name(pctldev->dev), devname)) {
 			/* Matched on device name */
 			found = true;
 			break;

drivers/pinctrl/core.h+1−2

@@ -72,8 +72,7 @@ struct pin_desc { · 71 unmodified lines
72	#endif	72	#endif
73	};	73	};
74		74
75	struct pinctrl_dev get_pinctrl_dev_from_dev(struct device dev,	75	struct pinctrl_dev get_pinctrl_dev_from_devname(const char dev_name);
76	const char *dev_name);
77	struct pin_desc pin_desc_get(struct pinctrl_dev pctldev, unsigned int pin);	76	struct pin_desc pin_desc_get(struct pinctrl_dev pctldev, unsigned int pin);
78	int pin_get_from_name(struct pinctrl_dev pctldev, const char name);	77	int pin_get_from_name(struct pinctrl_dev pctldev, const char name);
79	int pinctrl_get_device_gpio_range(unsigned gpio,	78	int pinctrl_get_device_gpio_range(unsigned gpio,

drivers/pinctrl/pinconf.c+4−4

@@ -51,7 +51,7 @@ int pin_config_get(const char dev_name, const char name, · 50 unmodified lines
51	struct pinctrl_dev *pctldev;	51	struct pinctrl_dev *pctldev;
52	int pin;	52	int pin;
53		53
54	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);	54	pctldev = get_pinctrl_dev_from_devname(dev_name);
55	if (!pctldev)	55	if (!pctldev)
56	return -EINVAL;	56	return -EINVAL;
57		57
@@ -99,7 +99,7 @@ int pin_config_set(const char dev_name, const char name, · 41 unmodified lines
99	struct pinctrl_dev *pctldev;	99	struct pinctrl_dev *pctldev;
100	int pin;	100	int pin;
101		101
102	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);	102	pctldev = get_pinctrl_dev_from_devname(dev_name);
103	if (!pctldev)	103	if (!pctldev)
104	return -EINVAL;	104	return -EINVAL;
105		105
@@ -118,7 +118,7 @@ int pin_config_group_get(const char dev_name, const char pin_group, · 12 unmodified lines
118	const struct pinconf_ops *ops;	118	const struct pinconf_ops *ops;
119	int selector;	119	int selector;
120		120
121	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);	121	pctldev = get_pinctrl_dev_from_devname(dev_name);
122	if (!pctldev)	122	if (!pctldev)
123	return -EINVAL;	123	return -EINVAL;
124	ops = pctldev->desc->confops;	124	ops = pctldev->desc->confops;
@@ -151,7 +151,7 @@ int pin_config_group_set(const char dev_name, const char pin_group, · 26 unmodified lines
151	int ret;	151	int ret;
152	int i;	152	int i;
153		153
154	pctldev = get_pinctrl_dev_from_dev(NULL, dev_name);	154	pctldev = get_pinctrl_dev_from_devname(dev_name);
155	if (!pctldev)	155	if (!pctldev)
156	return -EINVAL;	156	return -EINVAL;
157	ops = pctldev->desc->confops;	157	ops = pctldev->desc->confops;

drivers/pinctrl/pinmux.c+8−19

 			return -EINVAL;
 		}
-		if (!maps[i].ctrl_dev && !maps[i].ctrl_dev_name) {
+		if (!maps[i].ctrl_dev_name) {
 			pr_err("failed to register map %s (%d): no pin control device given\n",
 			       maps[i].name, i);
 			return -EINVAL;
 			return -EINVAL;
 		}
-		if (!maps[i].dev && !maps[i].dev_name)
+		if (!maps[i].dev_name)
 			pr_debug("add system map %s function %s with no device\n",
 				 maps[i].name,
 				 maps[i].function);
 		/*
 		 * First, try to find the pctldev given in the map
 		 */
-		pctldev = get_pinctrl_dev_from_dev(map->ctrl_dev,
+		pctldev = get_pinctrl_dev_from_devname(map->ctrl_dev_name);
-						   map->ctrl_dev_name);
 		if (!pctldev) {
-			const char *devname = NULL;
-			if (map->ctrl_dev)
-				devname = dev_name(map->ctrl_dev);
-			else if (map->ctrl_dev_name)
-				devname = map->ctrl_dev_name;
 			pr_warning("could not find a pinctrl device for pinmux function %s, fishy, they shall all have one\n",
 				   map->function);
 			pr_warning("given pinctrl device name: %s",
-				   devname ? devname : "UNDEFINED");
+				   map->ctrl_dev_name);
 			/* Continue to check the other mappings anyway... */
 			continue;
 	struct pinmux *pmx;
 	int ret;
-	if (map->dev || map->dev_name) {
+	if (map->dev_name) {
 		/*
 		 * TODO: the day we have device tree support, we can
 		 * traverse the device tree and hog to specific device nodes
 		if (!map->hog_on_boot)
 			continue;
-		if ((map->ctrl_dev == dev) ||
+		if (map->ctrl_dev_name &&
-			(map->ctrl_dev_name &&
+		    !strcmp(map->ctrl_dev_name, devname)) {
-				!strcmp(map->ctrl_dev_name, devname))) {
 			/* OK time to hog! */
 			ret = pinmux_hog_map(pctldev, map);
 			if (ret)
 		struct pinmux_map const *map = &pinmux_maps[i];
 		seq_printf(s, "%s:\n", map->name);
-		if (map->dev || map->dev_name)
+		if (map->dev_name)
 			seq_printf(s, "  device: %s\n",
-				   map->dev ? dev_name(map->dev) :
 				   map->dev_name);
 		else
 			seq_printf(s, "  SYSTEM MUX\n");
 		seq_printf(s, "  controlling device %s\n",
-			   map->ctrl_dev ? dev_name(map->ctrl_dev) :
 			   map->ctrl_dev_name);
 		seq_printf(s, "  function: %s\n", map->function);
 		seq_printf(s, "  group: %s\n", map->group ? map->group :

include/linux/pinctrl/machine.h+2−10

  * @name: the name of this specific map entry for the particular machine.
  *	This is the second parameter passed to pinmux_get() when you want
  *	to have several mappings to the same device
- * @ctrl_dev: the pin control device to be used by this mapping, may be NULL
- *	if you provide .ctrl_dev_name instead (this is more common)
  * @ctrl_dev_name: the name of the device controlling this specific mapping,
- *	the name must be the same as in your struct device*, may be NULL if
+ *	the name must be the same as in your struct device*
- *	you provide .ctrl_dev instead
  * @function: a function in the driver to use for this mapping, the driver
  *	will lookup the function referenced by this ID on the specified
  *	pin control device
  * @group: sometimes a function can map to different pin groups, so this
  *	selects a certain specific pin group to activate for the function, if
  *	left as NULL, the first applicable group will be used
- * @dev: the device using this specific mapping, may be NULL if you provide
- *	.dev_name instead (this is more common)
  * @dev_name: the name of the device using this specific mapping, the name
- *	must be the same as in your struct device*, may be NULL if you
+ *	must be the same as in your struct device*
- *	provide .dev instead
  * @hog_on_boot: if this is set to true, the pin control subsystem will itself
  *	hog the mappings as the pinmux device drivers are attached, so this is
  *	typically used with system maps (mux mappings without an assigned
  */
 struct pinmux_map {
 	const char *name;
-	struct device *ctrl_dev;
 	const char *ctrl_dev_name;
 	const char *function;
 	const char *group;
-	struct device *dev;
 	const char *dev_name;
 	bool hog_on_boot;
 };

pinctrl: delete raw device pointers in pinmux maps

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code