Merge tag 'pci-v3.17-changes-3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-single.c

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index ff6a2bda52e570cba4904a747ffb9f9c9ea32dc1..95dd9cf55cb36ab2d5af88b21a437b89adba8656 100644 (file)
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -780,7 +780,7 @@ static int pcs_add_pin(struct pcs_device *pcs, unsigned offset,
 
        pin = &pcs->pins.pa[i];
        pn = &pcs->names[i];
-       sprintf(pn->name, "%lx.%d",
+       sprintf(pn->name, "%lx.%u",
                (unsigned long)pcs->res->start + offset, pin_pos);
        pin->name = pn->name;
        pin->number = i;
@@ -1683,11 +1683,10 @@ static void pcs_irq_chain_handler(unsigned int irq, struct irq_desc *desc)
 {
        struct pcs_soc_data *pcs_soc = irq_desc_get_handler_data(desc);
        struct irq_chip *chip;
-       int res;
 
        chip = irq_get_chip(irq);
        chained_irq_enter(chip, desc);
-       res = pcs_irq_handle(pcs_soc);
+       pcs_irq_handle(pcs_soc);
        /* REVISIT: export and add handle_bad_irq(irq, desc)? */
        chained_irq_exit(chip, desc);