Commit 5411ca71 authored by Chris Healy's avatar Chris Healy Committed by David S. Miller
Browse files

net: sfp: Unique GPIO interrupt names 



Dynamically generate a unique GPIO interrupt name, based on the
device name and the GPIO name.  For example:

103:          0   sx1503q  12 Edge      sff2-los
104:          0   sx1503q  13 Edge      sff2-tx-fault

The sffX indicates the SFP the los and tx-fault are associated with.

v3:
- reverse Christmas tree new variable
- fix spaces vs tabs
v2:
- added net-next to PATCH part of subject line
- switched to devm_kasprintf()

Signed-off-by: default avatarChris Healy <cphealy@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14f5d8e3

drivers/net/phy/sfp.c

+6 −1
Original line number Diff line number Diff line
@@ -2238,6 +2238,7 @@ static int sfp_probe(struct platform_device *pdev) 
{

	const struct sff_data *sff;

	struct i2c_adapter *i2c;

	char *sfp_irq_name;

	struct sfp *sfp;

	int err, i;
@@ -2349,12 +2350,16 @@ static int sfp_probe(struct platform_device *pdev) 
			continue;

		}



		sfp_irq_name = devm_kasprintf(sfp->dev, GFP_KERNEL,

					      "%s-%s", dev_name(sfp->dev),

					      gpio_of_names[i]);



		err = devm_request_threaded_irq(sfp->dev, sfp->gpio_irq[i],

						NULL, sfp_irq,

						IRQF_ONESHOT |

						IRQF_TRIGGER_RISING |

						IRQF_TRIGGER_FALLING,

						dev_name(sfp->dev), sfp);

						sfp_irq_name, sfp);

		if (err) {

			sfp->gpio_irq[i] = 0;

			sfp->need_poll = true;