Commit 32fc5aa2 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpiolib: unexport devprop_gpiochip_set_names() 



Now that devprop_gpiochip_set_names() is only used in a single place
inside drivers/gpio/gpiolib.c, there's no need anymore for it to be
exported or to even live in its own source file. Pull this function into
the core source file for gpiolib.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 7cba1a4d

drivers/gpio/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG 
obj-$(CONFIG_GPIOLIB)		+= gpiolib.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-devres.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-devres.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-legacy.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-legacy.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-devprop.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-cdev.o

obj-$(CONFIG_GPIOLIB)		+= gpiolib-cdev.o

obj-$(CONFIG_OF_GPIO)		+= gpiolib-of.o

obj-$(CONFIG_OF_GPIO)		+= gpiolib-of.o

obj-$(CONFIG_GPIO_SYSFS)	+= gpiolib-sysfs.o

obj-$(CONFIG_GPIO_SYSFS)	+= gpiolib-sysfs.o

drivers/gpio/gpiolib-devprop.c

deleted100644 → 0
+0 −63
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Device property helpers for GPIO chips.

 *

 * Copyright (C) 2016, Intel Corporation

 * Author: Mika Westerberg <mika.westerberg@linux.intel.com>

 */



#include <linux/property.h>

#include <linux/slab.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio/driver.h>

#include <linux/export.h>



#include "gpiolib.h"



/**

 * devprop_gpiochip_set_names - Set GPIO line names using device properties

 * @chip: GPIO chip whose lines should be named, if possible

 *

 * Looks for device property "gpio-line-names" and if it exists assigns

 * GPIO line names for the chip. The memory allocated for the assigned

 * names belong to the underlying software node and should not be released

 * by the caller.

 */

int devprop_gpiochip_set_names(struct gpio_chip *chip)

{

	struct gpio_device *gdev = chip->gpiodev;

	struct device *dev = chip->parent;

	const char **names;

	int ret, i;

	int count;



	count = device_property_string_array_count(dev, "gpio-line-names");

	if (count < 0)

		return 0;



	if (count > gdev->ngpio) {

		dev_warn(&gdev->dev, "gpio-line-names is length %d but should be at most length %d",

			 count, gdev->ngpio);

		count = gdev->ngpio;

	}



	names = kcalloc(count, sizeof(*names), GFP_KERNEL);

	if (!names)

		return -ENOMEM;



	ret = device_property_read_string_array(dev, "gpio-line-names",

						names, count);

	if (ret < 0) {

		dev_warn(&gdev->dev, "failed to read GPIO line names\n");

		kfree(names);

		return ret;

	}



	for (i = 0; i < count; i++)

		gdev->descs[i].name = names[i];



	kfree(names);



	return 0;

}

EXPORT_SYMBOL_GPL(devprop_gpiochip_set_names);

drivers/gpio/gpiolib.c

+47 −0
Original line number Original line Diff line number Diff line
@@ -358,6 +358,53 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc) 
	return 0;

	return 0;

}

}





/*

 * devprop_gpiochip_set_names - Set GPIO line names using device properties

 * @chip: GPIO chip whose lines should be named, if possible

 *

 * Looks for device property "gpio-line-names" and if it exists assigns

 * GPIO line names for the chip. The memory allocated for the assigned

 * names belong to the underlying software node and should not be released

 * by the caller.

 */

static int devprop_gpiochip_set_names(struct gpio_chip *chip)

{

	struct gpio_device *gdev = chip->gpiodev;

	struct device *dev = chip->parent;

	const char **names;

	int ret, i;

	int count;



	count = device_property_string_array_count(dev, "gpio-line-names");

	if (count < 0)

		return 0;



	if (count > gdev->ngpio) {

		dev_warn(&gdev->dev, "gpio-line-names is length %d but should be at most length %d",

			 count, gdev->ngpio);

		count = gdev->ngpio;

	}



	names = kcalloc(count, sizeof(*names), GFP_KERNEL);

	if (!names)

		return -ENOMEM;



	ret = device_property_read_string_array(dev, "gpio-line-names",

						names, count);

	if (ret < 0) {

		dev_warn(&gdev->dev, "failed to read GPIO line names\n");

		kfree(names);

		return ret;

	}



	for (i = 0; i < count; i++)

		gdev->descs[i].name = names[i];



	kfree(names);



	return 0;

}



static unsigned long *gpiochip_allocate_mask(struct gpio_chip *gc)

static unsigned long *gpiochip_allocate_mask(struct gpio_chip *gc)

{

{

	unsigned long *p;

	unsigned long *p;

include/linux/gpio/driver.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -756,8 +756,6 @@ struct gpio_desc *gpiochip_request_own_desc(struct gpio_chip *gc, 
					    enum gpiod_flags dflags);

					    enum gpiod_flags dflags);

void gpiochip_free_own_desc(struct gpio_desc *desc);

void gpiochip_free_own_desc(struct gpio_desc *desc);





int devprop_gpiochip_set_names(struct gpio_chip *gc);



#ifdef CONFIG_GPIOLIB

#ifdef CONFIG_GPIOLIB





/* lock/unlock as IRQ */

/* lock/unlock as IRQ */