From: Laurent Pinchart Date: Wed, 28 Nov 2012 19:56:48 +0000 (+0100) Subject: sh-pfc: Don't take the sh_pfc spinlock in sh_pfc_map_gpios() X-Git-Tag: firefly_0821_release~3680^2~546^2~4^2~167 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d785fdb5d8ebdb0081624e9d8b220ff199c22645;p=firefly-linux-kernel-4.4.55.git sh-pfc: Don't take the sh_pfc spinlock in sh_pfc_map_gpios() The sh_pfc_map_gpios() function is only called at initialization time when no other task can access the sh_pfc fields. Don't protect the operation with a spinlock. Signed-off-by: Laurent Pinchart Acked-by: Linus Walleij --- diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index 9bd0a830c140..4ce2753cb2df 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c @@ -334,7 +334,6 @@ static void sh_pfc_map_one_gpio(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx, /* pinmux ranges -> pinctrl pin descs */ static int sh_pfc_map_gpios(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx) { - unsigned long flags; int i; pmx->nr_pads = pfc->info->last_gpio - pfc->info->first_gpio + 1; @@ -346,8 +345,6 @@ static int sh_pfc_map_gpios(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx) return -ENOMEM; } - spin_lock_irqsave(&pfc->lock, flags); - /* * We don't necessarily have a 1:1 mapping between pin and linux * GPIO number, as the latter maps to the associated enum_id. @@ -368,8 +365,6 @@ static int sh_pfc_map_gpios(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx) sh_pfc_map_one_gpio(pfc, pmx, gpio, i); } - spin_unlock_irqrestore(&pfc->lock, flags); - return 0; }