dm: gpio: rpi_b: Drop request()/free() in the driver

Now that the uclass supports gpio_request/free() there is no need for the
driver to implement it too. Drop this unnecessary code.

Signed-off-by: Simon Glass <sjg@chromium.org>

1 files changed, 0 insertions, 89 deletions

diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c
index 332cfc2b231..0244c018828 100644
--- a/drivers/gpio/bcm2835_gpio.c
+++ b/drivers/gpio/bcm2835_gpio.c
@@ -11,67 +11,10 @@
 #include <asm/gpio.h>
 #include <asm/io.h>
 
-#define GPIO_NAME_SIZE		20
-
 struct bcm2835_gpios {
-	char label[BCM2835_GPIO_COUNT][GPIO_NAME_SIZE];
 	struct bcm2835_gpio_regs *reg;
 };
 
-/**
- * gpio_is_requested() - check if a GPIO has been requested
- *
- * @bank:	Bank to check
- * @offset:	GPIO offset within bank to check
- * @return true if marked as requested, false if not
- */
-static inline bool gpio_is_requested(struct bcm2835_gpios *gpios, int offset)
-{
-	return *gpios->label[offset] != '\0';
-}
-
-static int check_requested(struct udevice *dev, unsigned offset,
-			   const char *func)
-{
-	struct bcm2835_gpios *gpios = dev_get_priv(dev);
-	struct gpio_dev_priv *uc_priv = dev->uclass_priv;
-
-	if (!gpio_is_requested(gpios, offset)) {
-		printf("omap_gpio: %s: error: gpio %s%d not requested\n",
-		       func, uc_priv->bank_name, offset);
-		return -EPERM;
-	}
-
-	return 0;
-}
-
-static int bcm2835_gpio_request(struct udevice *dev, unsigned offset,
-				const char *label)
-{
-	struct bcm2835_gpios *gpios = dev_get_priv(dev);
-
-	if (gpio_is_requested(gpios, offset))
-		return -EBUSY;
-
-	strncpy(gpios->label[offset], label, GPIO_NAME_SIZE);
-	gpios->label[offset][GPIO_NAME_SIZE - 1] = '\0';
-
-	return 0;
-}
-
-static int bcm2835_gpio_free(struct udevice *dev, unsigned offset)
-{
-	struct bcm2835_gpios *gpios = dev_get_priv(dev);
-	int ret;
-
-	ret = check_requested(dev, offset, __func__);
-	if (ret)
-		return ret;
-	gpios->label[offset][0] = '\0';
-
-	return 0;
-}
-
 static int bcm2835_gpio_direction_input(struct udevice *dev, unsigned gpio)
 {
 	struct bcm2835_gpios *gpios = dev_get_priv(dev);
@@ -142,9 +85,6 @@ static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset)
 {
 	struct bcm2835_gpios *gpios = dev_get_priv(dev);
 
-	if (!gpio_is_requested(gpios, offset))
-		return GPIOF_UNUSED;
-
 	/* GPIOF_FUNC is not implemented yet */
 	if (bcm2835_gpio_is_output(gpios, offset))
 		return GPIOF_OUTPUT;
@@ -152,42 +92,13 @@ static int bcm2835_gpio_get_function(struct udevice *dev, unsigned offset)
 		return GPIOF_INPUT;
 }
 
-static int bcm2835_gpio_get_state(struct udevice *dev, unsigned int offset,
-				  char *buf, int bufsize)
-{
-	struct gpio_dev_priv *uc_priv = dev->uclass_priv;
-	struct bcm2835_gpios *gpios = dev_get_priv(dev);
-	const char *label;
-	bool requested;
-	bool is_output;
-	int size;
-
-	label = gpios->label[offset];
-	is_output = bcm2835_gpio_is_output(gpios, offset);
-	size = snprintf(buf, bufsize, "%s%d: ",
-			uc_priv->bank_name ? uc_priv->bank_name : "", offset);
-	buf += size;
-	bufsize -= size;
-	requested = gpio_is_requested(gpios, offset);
-	snprintf(buf, bufsize, "%s: %d [%c]%s%s",
-		 is_output ? "out" : " in",
-		 bcm2835_get_value(gpios, offset),
-		 requested ? 'x' : ' ',
-		 requested ? " " : "",
-		 label);
-
-	return 0;
-}
 
 static const struct dm_gpio_ops gpio_bcm2835_ops = {
-	.request		= bcm2835_gpio_request,
-	.free			= bcm2835_gpio_free,
 	.direction_input	= bcm2835_gpio_direction_input,
 	.direction_output	= bcm2835_gpio_direction_output,
 	.get_value		= bcm2835_gpio_get_value,
 	.set_value		= bcm2835_gpio_set_value,
 	.get_function		= bcm2835_gpio_get_function,
-	.get_state		= bcm2835_gpio_get_state,
 };
 
 static int bcm2835_gpio_probe(struct udevice *dev)