Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
daec0bed
Commit
daec0bed
authored
Feb 08, 2016
by
Linus Walleij
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'error-return-from-get' into devel
parents
5041e791
a80bb4c9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
arch/blackfin/kernel/bfin_gpio.c
arch/blackfin/kernel/bfin_gpio.c
+1
-1
arch/powerpc/sysdev/ppc4xx_gpio.c
arch/powerpc/sysdev/ppc4xx_gpio.c
+1
-1
arch/powerpc/sysdev/simple_gpio.c
arch/powerpc/sysdev/simple_gpio.c
+1
-1
arch/unicore32/kernel/gpio.c
arch/unicore32/kernel/gpio.c
+1
-1
drivers/soc/fsl/qe/gpio.c
drivers/soc/fsl/qe/gpio.c
+1
-1
No files found.
arch/blackfin/kernel/bfin_gpio.c
View file @
daec0bed
...
@@ -1159,7 +1159,7 @@ static int bfin_gpiolib_direction_output(struct gpio_chip *chip, unsigned gpio,
...
@@ -1159,7 +1159,7 @@ static int bfin_gpiolib_direction_output(struct gpio_chip *chip, unsigned gpio,
static
int
bfin_gpiolib_get_value
(
struct
gpio_chip
*
chip
,
unsigned
gpio
)
static
int
bfin_gpiolib_get_value
(
struct
gpio_chip
*
chip
,
unsigned
gpio
)
{
{
return
bfin_gpio_get_value
(
gpio
);
return
!!
bfin_gpio_get_value
(
gpio
);
}
}
static
void
bfin_gpiolib_set_value
(
struct
gpio_chip
*
chip
,
unsigned
gpio
,
int
value
)
static
void
bfin_gpiolib_set_value
(
struct
gpio_chip
*
chip
,
unsigned
gpio
,
int
value
)
...
...
arch/powerpc/sysdev/ppc4xx_gpio.c
View file @
daec0bed
...
@@ -78,7 +78,7 @@ static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
...
@@ -78,7 +78,7 @@ static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
struct
of_mm_gpio_chip
*
mm_gc
=
to_of_mm_gpio_chip
(
gc
);
struct
of_mm_gpio_chip
*
mm_gc
=
to_of_mm_gpio_chip
(
gc
);
struct
ppc4xx_gpio
__iomem
*
regs
=
mm_gc
->
regs
;
struct
ppc4xx_gpio
__iomem
*
regs
=
mm_gc
->
regs
;
return
in_be32
(
&
regs
->
ir
)
&
GPIO_MASK
(
gpio
);
return
!!
(
in_be32
(
&
regs
->
ir
)
&
GPIO_MASK
(
gpio
)
);
}
}
static
inline
void
static
inline
void
...
...
arch/powerpc/sysdev/simple_gpio.c
View file @
daec0bed
...
@@ -46,7 +46,7 @@ static int u8_gpio_get(struct gpio_chip *gc, unsigned int gpio)
...
@@ -46,7 +46,7 @@ static int u8_gpio_get(struct gpio_chip *gc, unsigned int gpio)
{
{
struct
of_mm_gpio_chip
*
mm_gc
=
to_of_mm_gpio_chip
(
gc
);
struct
of_mm_gpio_chip
*
mm_gc
=
to_of_mm_gpio_chip
(
gc
);
return
in_8
(
mm_gc
->
regs
)
&
u8_pin2mask
(
gpio
);
return
!!
(
in_8
(
mm_gc
->
regs
)
&
u8_pin2mask
(
gpio
)
);
}
}
static
void
u8_gpio_set
(
struct
gpio_chip
*
gc
,
unsigned
int
gpio
,
int
val
)
static
void
u8_gpio_set
(
struct
gpio_chip
*
gc
,
unsigned
int
gpio
,
int
val
)
...
...
arch/unicore32/kernel/gpio.c
View file @
daec0bed
...
@@ -52,7 +52,7 @@ device_initcall(puv3_gpio_leds_init);
...
@@ -52,7 +52,7 @@ device_initcall(puv3_gpio_leds_init);
static
int
puv3_gpio_get
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
static
int
puv3_gpio_get
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
{
{
return
readl
(
GPIO_GPLR
)
&
GPIO_GPIO
(
offset
);
return
!!
(
readl
(
GPIO_GPLR
)
&
GPIO_GPIO
(
offset
)
);
}
}
static
void
puv3_gpio_set
(
struct
gpio_chip
*
chip
,
unsigned
offset
,
int
value
)
static
void
puv3_gpio_set
(
struct
gpio_chip
*
chip
,
unsigned
offset
,
int
value
)
...
...
drivers/soc/fsl/qe/gpio.c
View file @
daec0bed
...
@@ -63,7 +63,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
...
@@ -63,7 +63,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
struct
qe_pio_regs
__iomem
*
regs
=
mm_gc
->
regs
;
struct
qe_pio_regs
__iomem
*
regs
=
mm_gc
->
regs
;
u32
pin_mask
=
1
<<
(
QE_PIO_PINS
-
1
-
gpio
);
u32
pin_mask
=
1
<<
(
QE_PIO_PINS
-
1
-
gpio
);
return
in_be32
(
&
regs
->
cpdata
)
&
pin_mask
;
return
!!
(
in_be32
(
&
regs
->
cpdata
)
&
pin_mask
)
;
}
}
static
void
qe_gpio_set
(
struct
gpio_chip
*
gc
,
unsigned
int
gpio
,
int
val
)
static
void
qe_gpio_set
(
struct
gpio_chip
*
gc
,
unsigned
int
gpio
,
int
val
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment