Commit ae84f15c authored by Abanoub Sameh's avatar Abanoub Sameh Committed by Andy Shevchenko
Browse files

gpio: ich: changed every 'unsigned' to 'unsigned int' 



Changed 'unsigned' to 'unsigned int'.
This makes the code more uniform, and compliant with the kernel coding style.

Signed-off-by: default avatarAbanoub Sameh <abanoubsameh@protonmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 22f61d4e

drivers/gpio/gpio-ich.c

+13 −13
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ struct ichx_desc { 
	u32 use_sel_ignore[3];



	/* Some chipsets have quirks, let these use their own request/get */

	int (*request)(struct gpio_chip *chip, unsigned offset);

	int (*get)(struct gpio_chip *chip, unsigned offset);

	int (*request)(struct gpio_chip *chip, unsigned int offset);

	int (*get)(struct gpio_chip *chip, unsigned int offset);



	/*

	 * Some chipsets don't let reading output values on GPIO_LVL register
@@ -100,7 +100,7 @@ static int modparam_gpiobase = -1; /* dynamic */ 
module_param_named(gpiobase, modparam_gpiobase, int, 0444);

MODULE_PARM_DESC(gpiobase, "The GPIO number base. -1 means dynamic, which is the default.");



static int ichx_write_bit(int reg, unsigned nr, int val, int verify)

static int ichx_write_bit(int reg, unsigned int nr, int val, int verify)

{

	unsigned long flags;

	u32 data, tmp;
@@ -132,7 +132,7 @@ static int ichx_write_bit(int reg, unsigned nr, int val, int verify) 
	return (verify && data != tmp) ? -EPERM : 0;

}



static int ichx_read_bit(int reg, unsigned nr)

static int ichx_read_bit(int reg, unsigned int nr)

{

	unsigned long flags;

	u32 data;
@@ -152,12 +152,12 @@ static int ichx_read_bit(int reg, unsigned nr) 
	return !!(data & BIT(bit));

}



static bool ichx_gpio_check_available(struct gpio_chip *gpio, unsigned nr)

static bool ichx_gpio_check_available(struct gpio_chip *gpio, unsigned int nr)

{

	return !!(ichx_priv.use_gpio & BIT(nr / 32));

}



static int ichx_gpio_get_direction(struct gpio_chip *gpio, unsigned nr)

static int ichx_gpio_get_direction(struct gpio_chip *gpio, unsigned int nr)

{

	if (ichx_read_bit(GPIO_IO_SEL, nr))

		return GPIO_LINE_DIRECTION_IN;
@@ -165,7 +165,7 @@ static int ichx_gpio_get_direction(struct gpio_chip *gpio, unsigned nr) 
	return GPIO_LINE_DIRECTION_OUT;

}



static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)

static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned int nr)

{

	/*

	 * Try setting pin as an input and verify it worked since many pins
@@ -174,7 +174,7 @@ static int ichx_gpio_direction_input(struct gpio_chip *gpio, unsigned nr) 
	return ichx_write_bit(GPIO_IO_SEL, nr, 1, 1);

}



static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,

static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned int nr,

					int val)

{

	/* Disable blink hardware which is available for GPIOs from 0 to 31. */
@@ -191,12 +191,12 @@ static int ichx_gpio_direction_output(struct gpio_chip *gpio, unsigned nr, 
	return ichx_write_bit(GPIO_IO_SEL, nr, 0, 1);

}



static int ichx_gpio_get(struct gpio_chip *chip, unsigned nr)

static int ichx_gpio_get(struct gpio_chip *chip, unsigned int nr)

{

	return ichx_read_bit(GPIO_LVL, nr);

}



static int ich6_gpio_get(struct gpio_chip *chip, unsigned nr)

static int ich6_gpio_get(struct gpio_chip *chip, unsigned int nr)

{

	unsigned long flags;

	u32 data;
@@ -223,7 +223,7 @@ static int ich6_gpio_get(struct gpio_chip *chip, unsigned nr) 
	}

}



static int ichx_gpio_request(struct gpio_chip *chip, unsigned nr)

static int ichx_gpio_request(struct gpio_chip *chip, unsigned int nr)

{

	if (!ichx_gpio_check_available(chip, nr))

		return -ENXIO;
@@ -240,7 +240,7 @@ static int ichx_gpio_request(struct gpio_chip *chip, unsigned nr) 
	return ichx_read_bit(GPIO_USE_SEL, nr) ? 0 : -ENODEV;

}



static int ich6_gpio_request(struct gpio_chip *chip, unsigned nr)

static int ich6_gpio_request(struct gpio_chip *chip, unsigned int nr)

{

	/*

	 * Fixups for bits 16 and 17 are necessary on the Intel ICH6/3100
@@ -254,7 +254,7 @@ static int ich6_gpio_request(struct gpio_chip *chip, unsigned nr) 
	return ichx_gpio_request(chip, nr);

}



static void ichx_gpio_set(struct gpio_chip *chip, unsigned nr, int val)

static void ichx_gpio_set(struct gpio_chip *chip, unsigned int nr, int val)

{

	ichx_write_bit(GPIO_LVL, nr, val, 0);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE