Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
pinctrl
/
sirf
/
pinctrl-sirf.c
diff --git
a/kernel/drivers/pinctrl/sirf/pinctrl-sirf.c
b/kernel/drivers/pinctrl/sirf/pinctrl-sirf.c
index
e2efbba
..
2a8d697
100644
(file)
--- a/
kernel/drivers/pinctrl/sirf/pinctrl-sirf.c
+++ b/
kernel/drivers/pinctrl/sirf/pinctrl-sirf.c
@@
-310,9
+310,9
@@
static int sirfsoc_pinmux_probe(struct platform_device *pdev)
/* Now register the pin controller and all pins it handles */
spmx->pmx = pinctrl_register(&sirfsoc_pinmux_desc, &pdev->dev, spmx);
/* Now register the pin controller and all pins it handles */
spmx->pmx = pinctrl_register(&sirfsoc_pinmux_desc, &pdev->dev, spmx);
- if (
!spmx->pmx
) {
+ if (
IS_ERR(spmx->pmx)
) {
dev_err(&pdev->dev, "could not register SIRFSOC pinmux driver\n");
dev_err(&pdev->dev, "could not register SIRFSOC pinmux driver\n");
- ret =
-EINVAL
;
+ ret =
PTR_ERR(spmx->pmx)
;
goto out_no_pmx;
}
goto out_no_pmx;
}
@@
-545,14
+545,15
@@
static struct irq_chip sirfsoc_irq_chip = {
.irq_set_type = sirfsoc_gpio_irq_type,
};
.irq_set_type = sirfsoc_gpio_irq_type,
};
-static void sirfsoc_gpio_handle_irq(
unsigned int irq,
struct irq_desc *desc)
+static void sirfsoc_gpio_handle_irq(struct irq_desc *desc)
{
{
+ unsigned int irq = irq_desc_get_irq(desc);
struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
struct sirfsoc_gpio_bank *bank;
u32 status, ctrl;
int idx = 0;
struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct sirfsoc_gpio_chip *sgpio = to_sirfsoc_gpio(gc);
struct sirfsoc_gpio_bank *bank;
u32 status, ctrl;
int idx = 0;
- struct irq_chip *chip = irq_
get_chip(irq
);
+ struct irq_chip *chip = irq_
desc_get_chip(desc
);
int i;
for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
int i;
for (i = 0; i < SIRFSOC_GPIO_NO_OF_BANKS; i++) {
@@
-569,7
+570,7
@@
static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc)
printk(KERN_WARNING
"%s: gpio id %d status %#x no interrupt is flagged\n",
__func__, bank->id, status);
printk(KERN_WARNING
"%s: gpio id %d status %#x no interrupt is flagged\n",
__func__, bank->id, status);
- handle_bad_irq(
irq,
desc);
+ handle_bad_irq(desc);
return;
}
return;
}