Commit faf6efd2 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bartosz Golaszewski
Browse files

gpio: constify opaque pointer in gpio_device_find() match function 



The match function used in gpio_device_find() should not modify the
contents of passed opaque pointer, because such modification would not
be necessary for actual matching and it could lead to quite unreadable,
spaghetti code.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[Bartosz: fix coding style in header]
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 104e00bb

drivers/gpio/gpiolib-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static DEFINE_MUTEX(acpi_gpio_deferred_req_irqs_lock); 
static LIST_HEAD(acpi_gpio_deferred_req_irqs_list);

static bool acpi_gpio_deferred_req_irqs_done;



static int acpi_gpiochip_find(struct gpio_chip *gc, void *data)

static int acpi_gpiochip_find(struct gpio_chip *gc, const void *data)

{

	return device_match_acpi_handle(&gc->gpiodev->dev, data);

}

drivers/gpio/gpiolib-of.c

+4 −3
Original line number Diff line number Diff line
@@ -118,9 +118,10 @@ int of_gpio_get_count(struct device *dev, const char *con_id) 
	return ret ? ret : -ENOENT;

}



static int of_gpiochip_match_node_and_xlate(struct gpio_chip *chip, void *data)

static int of_gpiochip_match_node_and_xlate(struct gpio_chip *chip,

					    const void *data)

{

	struct of_phandle_args *gpiospec = data;

	const struct of_phandle_args *gpiospec = data;



	return device_match_of_node(&chip->gpiodev->dev, gpiospec->np) &&

				chip->of_xlate &&
@@ -852,7 +853,7 @@ static void of_gpiochip_remove_hog(struct gpio_chip *chip, 
			gpiochip_free_own_desc(desc);

}



static int of_gpiochip_match_node(struct gpio_chip *chip, void *data)

static int of_gpiochip_match_node(struct gpio_chip *chip, const void *data)

{

	return device_match_of_node(&chip->gpiodev->dev, data);

}

drivers/gpio/gpiolib.c

+3 −3
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ EXPORT_SYMBOL_GPL(gpiochip_remove); 
 */

struct gpio_device *gpio_device_find(void *data,

				     int (*match)(struct gpio_chip *gc,

						  void *data))

						  const void *data))

{

	struct gpio_device *gdev;
@@ -1141,7 +1141,7 @@ struct gpio_device *gpio_device_find(void *data, 
}

EXPORT_SYMBOL_GPL(gpio_device_find);



static int gpio_chip_match_by_label(struct gpio_chip *gc, void *label)

static int gpio_chip_match_by_label(struct gpio_chip *gc, const void *label)

{

	return gc->label && !strcmp(gc->label, label);

}
@@ -1161,7 +1161,7 @@ struct gpio_device *gpio_device_find_by_label(const char *label) 
}

EXPORT_SYMBOL_GPL(gpio_device_find_by_label);



static int gpio_chip_match_by_fwnode(struct gpio_chip *gc, void *fwnode)

static int gpio_chip_match_by_fwnode(struct gpio_chip *gc, const void *fwnode)

{

	return device_match_fwnode(&gc->gpiodev->dev, fwnode);

}

include/linux/gpio/driver.h

+2 −1
Original line number Diff line number Diff line
@@ -629,7 +629,8 @@ int devm_gpiochip_add_data_with_key(struct device *dev, struct gpio_chip *gc, 
				    struct lock_class_key *request_key);



struct gpio_device *gpio_device_find(void *data,

				int (*match)(struct gpio_chip *gc, void *data));

				int (*match)(struct gpio_chip *gc,

					     const void *data));

struct gpio_device *gpio_device_find_by_label(const char *label);

struct gpio_device *gpio_device_find_by_fwnode(const struct fwnode_handle *fwnode);