Commit f35cb547 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: sfp: rename gpio_of_names[]

There's nothing DT specific about the gpio_of_names array, let's drop
the _of infix.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b71dda81
...@@ -144,7 +144,7 @@ static const char *sm_state_to_str(unsigned short sm_state) ...@@ -144,7 +144,7 @@ static const char *sm_state_to_str(unsigned short sm_state)
return sm_state_strings[sm_state]; return sm_state_strings[sm_state];
} }
static const char *gpio_of_names[] = { static const char *gpio_names[] = {
"mod-def0", "mod-def0",
"los", "los",
"tx-fault", "tx-fault",
...@@ -2563,7 +2563,7 @@ static void sfp_check_state(struct sfp *sfp) ...@@ -2563,7 +2563,7 @@ static void sfp_check_state(struct sfp *sfp)
for (i = 0; i < GPIO_MAX; i++) for (i = 0; i < GPIO_MAX; i++)
if (changed & BIT(i)) if (changed & BIT(i))
dev_dbg(sfp->dev, "%s %u -> %u\n", gpio_of_names[i], dev_dbg(sfp->dev, "%s %u -> %u\n", gpio_names[i],
!!(sfp->state & BIT(i)), !!(state & BIT(i))); !!(sfp->state & BIT(i)), !!(state & BIT(i)));
state |= sfp->state & (SFP_F_TX_DISABLE | SFP_F_RATE_SELECT); state |= sfp->state & (SFP_F_TX_DISABLE | SFP_F_RATE_SELECT);
...@@ -2698,7 +2698,7 @@ static int sfp_probe(struct platform_device *pdev) ...@@ -2698,7 +2698,7 @@ static int sfp_probe(struct platform_device *pdev)
for (i = 0; i < GPIO_MAX; i++) for (i = 0; i < GPIO_MAX; i++)
if (sff->gpios & BIT(i)) { if (sff->gpios & BIT(i)) {
sfp->gpio[i] = devm_gpiod_get_optional(sfp->dev, sfp->gpio[i] = devm_gpiod_get_optional(sfp->dev,
gpio_of_names[i], gpio_flags[i]); gpio_names[i], gpio_flags[i]);
if (IS_ERR(sfp->gpio[i])) if (IS_ERR(sfp->gpio[i]))
return PTR_ERR(sfp->gpio[i]); return PTR_ERR(sfp->gpio[i]);
} }
...@@ -2753,7 +2753,7 @@ static int sfp_probe(struct platform_device *pdev) ...@@ -2753,7 +2753,7 @@ static int sfp_probe(struct platform_device *pdev)
sfp_irq_name = devm_kasprintf(sfp->dev, GFP_KERNEL, sfp_irq_name = devm_kasprintf(sfp->dev, GFP_KERNEL,
"%s-%s", dev_name(sfp->dev), "%s-%s", dev_name(sfp->dev),
gpio_of_names[i]); gpio_names[i]);
if (!sfp_irq_name) if (!sfp_irq_name)
return -ENOMEM; return -ENOMEM;
......
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