Skip to content

L
linux
Commit db1b2a8c authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files
Options

pinctrl: cherryview: Use temporary variable for struct device 

Use temporary variable for struct device to make code neater.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 07199dbf
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
drivers/pinctrl/intel/pinctrl-cherryview.c
View file @ db1b2a8c
...@@ -711,6 +711,7 @@ static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev, ...@@ -711,6 +711,7 @@ static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev,
unsigned int function, unsigned int group) unsigned int function, unsigned int group)
{ {
struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
struct device *dev = pctrl->dev;
const struct intel_pingroup *grp; const struct intel_pingroup *grp;
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -722,9 +723,8 @@ static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev, ...@@ -722,9 +723,8 @@ static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev,
/* Check first that the pad is not locked */ /* Check first that the pad is not locked */
for (i = 0; i < grp->npins; i++) { for (i = 0; i < grp->npins; i++) {
if (chv_pad_locked(pctrl, grp->pins[i])) { if (chv_pad_locked(pctrl, grp->pins[i])) {
dev_warn(pctrl->dev, "unable to set mode for locked pin %u\n",
grp->pins[i]);
raw_spin_unlock_irqrestore(&chv_lock, flags); raw_spin_unlock_irqrestore(&chv_lock, flags);
dev_warn(dev, "unable to set mode for locked pin %u\n", grp->pins[i]);
return -EBUSY; return -EBUSY;
} }
} }
...@@ -759,8 +759,8 @@ static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev, ...@@ -759,8 +759,8 @@ static int chv_pinmux_set_mux(struct pinctrl_dev *pctldev,
value |= CHV_PADCTRL1_INVRXTX_TXENABLE; value |= CHV_PADCTRL1_INVRXTX_TXENABLE;
chv_writel(pctrl, pin, CHV_PADCTRL1, value); chv_writel(pctrl, pin, CHV_PADCTRL1, value);
dev_dbg(pctrl->dev, "configured pin %u mode %u OE %sinverted\n", dev_dbg(dev, "configured pin %u mode %u OE %sinverted\n", pin, mode,
pin, mode, invert_oe ? "" : "not "); invert_oe ? "" : "not ");
} }
raw_spin_unlock_irqrestore(&chv_lock, flags); raw_spin_unlock_irqrestore(&chv_lock, flags);
...@@ -1060,6 +1060,7 @@ static int chv_config_set(struct pinctrl_dev *pctldev, unsigned int pin, ...@@ -1060,6 +1060,7 @@ static int chv_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
unsigned long *configs, unsigned int nconfigs) unsigned long *configs, unsigned int nconfigs)
{ {
struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
struct device *dev = pctrl->dev;
enum pin_config_param param; enum pin_config_param param;
int i, ret; int i, ret;
u32 arg; u32 arg;
...@@ -1096,8 +1097,7 @@ static int chv_config_set(struct pinctrl_dev *pctldev, unsigned int pin, ...@@ -1096,8 +1097,7 @@ static int chv_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
return -ENOTSUPP; return -ENOTSUPP;
} }
dev_dbg(pctrl->dev, "pin %d set config %d arg %u\n", pin, dev_dbg(dev, "pin %d set config %d arg %u\n", pin, param, arg);
param, arg);
} }
return 0; return 0;
...@@ -1304,6 +1304,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d) ...@@ -1304,6 +1304,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d)
if (irqd_get_trigger_type(d) == IRQ_TYPE_NONE) { if (irqd_get_trigger_type(d) == IRQ_TYPE_NONE) {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct intel_pinctrl *pctrl = gpiochip_get_data(gc); struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
struct device *dev = pctrl->dev;
struct intel_community_context *cctx = &pctrl->context.communities[0]; struct intel_community_context *cctx = &pctrl->context.communities[0];
unsigned int pin = irqd_to_hwirq(d); unsigned int pin = irqd_to_hwirq(d);
irq_flow_handler_t handler; irq_flow_handler_t handler;
...@@ -1323,7 +1324,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d) ...@@ -1323,7 +1324,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d)
if (cctx->intr_lines[intsel] == CHV_INVALID_HWIRQ) { if (cctx->intr_lines[intsel] == CHV_INVALID_HWIRQ) {
irq_set_handler_locked(d, handler); irq_set_handler_locked(d, handler);
dev_dbg(pctrl->dev, "using interrupt line %u for IRQ_TYPE_NONE on pin %u\n", dev_dbg(dev, "using interrupt line %u for IRQ_TYPE_NONE on pin %u\n",
intsel, pin); intsel, pin);
cctx->intr_lines[intsel] = pin; cctx->intr_lines[intsel] = pin;
} }
...@@ -1336,6 +1337,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d) ...@@ -1336,6 +1337,7 @@ static unsigned chv_gpio_irq_startup(struct irq_data *d)
static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin) static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin)
{ {
struct device *dev = pctrl->dev;
struct intel_community_context *cctx = &pctrl->context.communities[0]; struct intel_community_context *cctx = &pctrl->context.communities[0];
const struct intel_community *community = &pctrl->communities[0]; const struct intel_community *community = &pctrl->communities[0];
u32 value, intsel; u32 value, intsel;
...@@ -1348,7 +1350,7 @@ static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin) ...@@ -1348,7 +1350,7 @@ static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin)
return 0; return 0;
if (cctx->intr_lines[intsel] == CHV_INVALID_HWIRQ) { if (cctx->intr_lines[intsel] == CHV_INVALID_HWIRQ) {
dev_dbg(pctrl->dev, "using interrupt line %u for pin %u\n", intsel, pin); dev_dbg(dev, "using interrupt line %u for pin %u\n", intsel, pin);
cctx->intr_lines[intsel] = pin; cctx->intr_lines[intsel] = pin;
return 0; return 0;
} }
...@@ -1360,8 +1362,8 @@ static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin) ...@@ -1360,8 +1362,8 @@ static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin)
* IRQ which was not expected to be used as such by the BIOS authors, * IRQ which was not expected to be used as such by the BIOS authors,
* so log this at info level only. * so log this at info level only.
*/ */
dev_info(pctrl->dev, "interrupt line %u is used by both pin %u and pin %u\n", dev_info(dev, "interrupt line %u is used by both pin %u and pin %u\n", intsel,
intsel, cctx->intr_lines[intsel], pin); cctx->intr_lines[intsel], pin);
if (chv_pad_locked(pctrl, pin)) if (chv_pad_locked(pctrl, pin))
return -EBUSY; return -EBUSY;
...@@ -1377,7 +1379,7 @@ static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin) ...@@ -1377,7 +1379,7 @@ static int chv_gpio_set_intr_line(struct intel_pinctrl *pctrl, unsigned int pin)
if (i < 0) if (i < 0)
return -EBUSY; return -EBUSY;
dev_info(pctrl->dev, "changing the interrupt line for pin %u to %d\n", pin, i); dev_info(dev, "changing the interrupt line for pin %u to %d\n", pin, i);
value = (value & ~CHV_PADCTRL0_INTSEL_MASK) | (i << CHV_PADCTRL0_INTSEL_SHIFT); value = (value & ~CHV_PADCTRL0_INTSEL_MASK) | (i << CHV_PADCTRL0_INTSEL_SHIFT);
chv_writel(pctrl, pin, CHV_PADCTRL0, value); chv_writel(pctrl, pin, CHV_PADCTRL0, value);
...@@ -1450,6 +1452,7 @@ static void chv_gpio_irq_handler(struct irq_desc *desc) ...@@ -1450,6 +1452,7 @@ static void chv_gpio_irq_handler(struct irq_desc *desc)
{ {
struct gpio_chip *gc = irq_desc_get_handler_data(desc); struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct intel_pinctrl *pctrl = gpiochip_get_data(gc); struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
struct device *dev = pctrl->dev;
const struct intel_community *community = &pctrl->communities[0]; const struct intel_community *community = &pctrl->communities[0];
struct intel_community_context *cctx = &pctrl->context.communities[0]; struct intel_community_context *cctx = &pctrl->context.communities[0];
struct irq_chip *chip = irq_desc_get_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
...@@ -1468,8 +1471,7 @@ static void chv_gpio_irq_handler(struct irq_desc *desc) ...@@ -1468,8 +1471,7 @@ static void chv_gpio_irq_handler(struct irq_desc *desc)
offset = cctx->intr_lines[intr_line]; offset = cctx->intr_lines[intr_line];
if (offset == CHV_INVALID_HWIRQ) { if (offset == CHV_INVALID_HWIRQ) {
dev_err(pctrl->dev, "interrupt on unused interrupt line %u\n", dev_err(dev, "interrupt on unused interrupt line %u\n", intr_line);
intr_line);
continue; continue;
} }
...@@ -1573,17 +1575,16 @@ static int chv_gpio_irq_init_hw(struct gpio_chip *chip) ...@@ -1573,17 +1575,16 @@ static int chv_gpio_irq_init_hw(struct gpio_chip *chip)
static int chv_gpio_add_pin_ranges(struct gpio_chip *chip) static int chv_gpio_add_pin_ranges(struct gpio_chip *chip)
{ {
struct intel_pinctrl *pctrl = gpiochip_get_data(chip); struct intel_pinctrl *pctrl = gpiochip_get_data(chip);
struct device *dev = pctrl->dev;
const struct intel_community *community = &pctrl->communities[0]; const struct intel_community *community = &pctrl->communities[0];
const struct intel_padgroup *gpp; const struct intel_padgroup *gpp;
int ret, i; int ret, i;
for (i = 0; i < community->ngpps; i++) { for (i = 0; i < community->ngpps; i++) {
gpp = &community->gpps[i]; gpp = &community->gpps[i];
ret = gpiochip_add_pin_range(chip, dev_name(pctrl->dev), ret = gpiochip_add_pin_range(chip, dev_name(dev), gpp->base, gpp->base, gpp->size);
gpp->base, gpp->base,
gpp->size);
if (ret) { if (ret) {
dev_err(pctrl->dev, "failed to add GPIO pin range\n"); dev_err(dev, "failed to add GPIO pin range\n");
return ret; return ret;
} }
} }
...@@ -1596,15 +1597,16 @@ static int chv_gpio_probe(struct intel_pinctrl *pctrl, int irq) ...@@ -1596,15 +1597,16 @@ static int chv_gpio_probe(struct intel_pinctrl *pctrl, int irq)
const struct intel_community *community = &pctrl->communities[0]; const struct intel_community *community = &pctrl->communities[0];
const struct intel_padgroup *gpp; const struct intel_padgroup *gpp;
struct gpio_chip *chip = &pctrl->chip; struct gpio_chip *chip = &pctrl->chip;
struct device *dev = pctrl->dev;
bool need_valid_mask = !dmi_check_system(chv_no_valid_mask); bool need_valid_mask = !dmi_check_system(chv_no_valid_mask);
int ret, i, irq_base; int ret, i, irq_base;
*chip = chv_gpio_chip; *chip = chv_gpio_chip;
chip->ngpio = pctrl->soc->pins[pctrl->soc->npins - 1].number + 1; chip->ngpio = pctrl->soc->pins[pctrl->soc->npins - 1].number + 1;
chip->label = dev_name(pctrl->dev); chip->label = dev_name(dev);
chip->add_pin_ranges = chv_gpio_add_pin_ranges; chip->add_pin_ranges = chv_gpio_add_pin_ranges;
chip->parent = pctrl->dev; chip->parent = dev;
chip->base = -1; chip->base = -1;
pctrl->irq = irq; pctrl->irq = irq;
...@@ -1626,17 +1628,16 @@ static int chv_gpio_probe(struct intel_pinctrl *pctrl, int irq) ...@@ -1626,17 +1628,16 @@ static int chv_gpio_probe(struct intel_pinctrl *pctrl, int irq)
if (need_valid_mask) { if (need_valid_mask) {
chip->irq.init_valid_mask = chv_init_irq_valid_mask; chip->irq.init_valid_mask = chv_init_irq_valid_mask;
} else { } else {
irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0, irq_base = devm_irq_alloc_descs(dev, -1, 0, pctrl->soc->npins, NUMA_NO_NODE);
pctrl->soc->npins, NUMA_NO_NODE);
if (irq_base < 0) { if (irq_base < 0) {
dev_err(pctrl->dev, "Failed to allocate IRQ numbers\n"); dev_err(dev, "Failed to allocate IRQ numbers\n");
return irq_base; return irq_base;
} }
} }
ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl); ret = devm_gpiochip_add_data(dev, chip, pctrl);
if (ret) { if (ret) {
dev_err(pctrl->dev, "Failed to register gpiochip\n"); dev_err(dev, "Failed to register gpiochip\n");
return ret; return ret;
} }
...@@ -1834,15 +1835,15 @@ static int chv_pinctrl_resume_noirq(struct device *dev) ...@@ -1834,15 +1835,15 @@ static int chv_pinctrl_resume_noirq(struct device *dev)
val &= ~CHV_PADCTRL0_GPIORXSTATE; val &= ~CHV_PADCTRL0_GPIORXSTATE;
if (ctx->padctrl0 != val) { if (ctx->padctrl0 != val) {
chv_writel(pctrl, desc->number, CHV_PADCTRL0, ctx->padctrl0); chv_writel(pctrl, desc->number, CHV_PADCTRL0, ctx->padctrl0);
dev_dbg(pctrl->dev, "restored pin %2u ctrl0 0x%08x\n", dev_dbg(dev, "restored pin %2u ctrl0 0x%08x\n", desc->number,
desc->number, chv_readl(pctrl, desc->number, CHV_PADCTRL0)); chv_readl(pctrl, desc->number, CHV_PADCTRL0));
} }
val = chv_readl(pctrl, desc->number, CHV_PADCTRL1); val = chv_readl(pctrl, desc->number, CHV_PADCTRL1);
if (ctx->padctrl1 != val) { if (ctx->padctrl1 != val) {
chv_writel(pctrl, desc->number, CHV_PADCTRL1, ctx->padctrl1); chv_writel(pctrl, desc->number, CHV_PADCTRL1, ctx->padctrl1);
dev_dbg(pctrl->dev, "restored pin %2u ctrl1 0x%08x\n", dev_dbg(dev, "restored pin %2u ctrl1 0x%08x\n", desc->number,
desc->number, chv_readl(pctrl, desc->number, CHV_PADCTRL1)); chv_readl(pctrl, desc->number, CHV_PADCTRL1));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7