Commit a3cc68c3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Grant Likely
Browse files

gpio/74x164: remove unnecessary defines and prototype 



Remove the #define GEN_74X164_GPIO_COUNT since it's only used in
one place and it's meaning is obvious.  Also remove the #define
GEN_74X164_DRIVER_NAME and use spi->modalias to set the gpio chip's
label and the string "74x164" for the driver name.

Reorder the code slightly to remove the need to prototype
gen_74x164_set_value.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 1fa7b6a2

drivers/gpio/74x164.c

+11 −16
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
#include <linux/gpio.h>

#include <linux/slab.h>



#define GEN_74X164_GPIO_COUNT	8





struct gen_74x164_chip {

	struct spi_device	*spi;

	struct gpio_chip	gpio_chip;
@@ -26,8 +23,6 @@ struct gen_74x164_chip { 
	u8			port_config;

};



static void gen_74x164_set_value(struct gpio_chip *, unsigned, int);



static struct gen_74x164_chip *gpio_to_chip(struct gpio_chip *gc)

{

	return container_of(gc, struct gen_74x164_chip, gpio_chip);
@@ -39,13 +34,6 @@ static int __gen_74x164_write_config(struct gen_74x164_chip *chip) 
			 &chip->port_config, sizeof(chip->port_config));

}



static int gen_74x164_direction_output(struct gpio_chip *gc,

		unsigned offset, int val)

{

	gen_74x164_set_value(gc, offset, val);

	return 0;

}



static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset)

{

	struct gen_74x164_chip *chip = gpio_to_chip(gc);
@@ -73,6 +61,13 @@ static void gen_74x164_set_value(struct gpio_chip *gc, 
	mutex_unlock(&chip->lock);

}



static int gen_74x164_direction_output(struct gpio_chip *gc,

		unsigned offset, int val)

{

	gen_74x164_set_value(gc, offset, val);

	return 0;

}



static int __devinit gen_74x164_probe(struct spi_device *spi)

{

	struct gen_74x164_chip *chip;
@@ -104,12 +99,12 @@ static int __devinit gen_74x164_probe(struct spi_device *spi) 


	chip->spi = spi;



	chip->gpio_chip.label = GEN_74X164_DRIVER_NAME,

	chip->gpio_chip.label = spi->modalias;

	chip->gpio_chip.direction_output = gen_74x164_direction_output;

	chip->gpio_chip.get = gen_74x164_get_value;

	chip->gpio_chip.set = gen_74x164_set_value;

	chip->gpio_chip.base = pdata->base;

	chip->gpio_chip.ngpio = GEN_74X164_GPIO_COUNT;

	chip->gpio_chip.ngpio = 8;

	chip->gpio_chip.can_sleep = 1;

	chip->gpio_chip.dev = &spi->dev;

	chip->gpio_chip.owner = THIS_MODULE;
@@ -157,7 +152,7 @@ static int __devexit gen_74x164_remove(struct spi_device *spi) 


static struct spi_driver gen_74x164_driver = {

	.driver = {

		.name		= GEN_74X164_DRIVER_NAME,

		.name		= "74x164",

		.owner		= THIS_MODULE,

	},

	.probe		= gen_74x164_probe,

include/linux/spi/74x164.h

+0 −2
Original line number Diff line number Diff line 
#ifndef LINUX_SPI_74X164_H

#define LINUX_SPI_74X164_H



#define GEN_74X164_DRIVER_NAME "74x164"



struct gen_74x164_chip_platform_data {

	/* number assigned to the first GPIO */

	unsigned	base;

CRA Git | Maintained and supported by SUSTech CRA and CCSE