diff options
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/framer/pef2256/pef2256.c | 28 | ||||
| -rw-r--r-- | drivers/net/wan/lapbether.c | 2 |
2 files changed, 22 insertions, 8 deletions
diff --git a/drivers/net/wan/framer/pef2256/pef2256.c b/drivers/net/wan/framer/pef2256/pef2256.c index 1e4c8e85d598..c5501826db1e 100644 --- a/drivers/net/wan/framer/pef2256/pef2256.c +++ b/drivers/net/wan/framer/pef2256/pef2256.c @@ -37,6 +37,7 @@ struct pef2256 { struct device *dev; struct regmap *regmap; enum pef2256_version version; + const char *version_txt; struct clk *mclk; struct clk *sclkr; struct clk *sclkx; @@ -114,6 +115,16 @@ enum pef2256_version pef2256_get_version(struct pef2256 *pef2256) } EXPORT_SYMBOL_GPL(pef2256_get_version); +static ssize_t version_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct pef2256 *pef2256 = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%s\n", pef2256->version_txt); +} + +static DEVICE_ATTR_RO(version); + enum pef2256_gcm_config_item { PEF2256_GCM_CONFIG_1544000 = 0, PEF2256_GCM_CONFIG_2048000, @@ -697,7 +708,6 @@ static int pef2256_probe(struct platform_device *pdev) unsigned long sclkr_rate, sclkx_rate; struct framer_provider *framer_provider; struct pef2256 *pef2256; - const char *version_txt; void __iomem *iomem; int ret; int irq; @@ -719,8 +729,8 @@ static int pef2256_probe(struct platform_device *pdev) pef2256->regmap = devm_regmap_init_mmio(&pdev->dev, iomem, &pef2256_regmap_config); if (IS_ERR(pef2256->regmap)) { - dev_err(&pdev->dev, "Failed to initialise Regmap (%ld)\n", - PTR_ERR(pef2256->regmap)); + dev_err(&pdev->dev, "Failed to initialise Regmap (%pe)\n", + pef2256->regmap); return PTR_ERR(pef2256->regmap); } @@ -763,18 +773,18 @@ static int pef2256_probe(struct platform_device *pdev) pef2256->version = pef2256_get_version(pef2256); switch (pef2256->version) { case PEF2256_VERSION_1_2: - version_txt = "1.2"; + pef2256->version_txt = "1.2"; break; case PEF2256_VERSION_2_1: - version_txt = "2.1"; + pef2256->version_txt = "2.1"; break; case PEF2256_VERSION_2_2: - version_txt = "2.2"; + pef2256->version_txt = "2.2"; break; default: return -ENODEV; } - dev_info(pef2256->dev, "Version %s detected\n", version_txt); + dev_info(pef2256->dev, "Version %s detected\n", pef2256->version_txt); ret = pef2556_of_parse(pef2256, np); if (ret) @@ -835,6 +845,8 @@ static int pef2256_probe(struct platform_device *pdev) return ret; } + device_create_file(pef2256->dev, &dev_attr_version); + return 0; } @@ -849,6 +861,8 @@ static void pef2256_remove(struct platform_device *pdev) pef2256_write8(pef2256, PEF2256_IMR3, 0xff); pef2256_write8(pef2256, PEF2256_IMR4, 0xff); pef2256_write8(pef2256, PEF2256_IMR5, 0xff); + + device_remove_file(pef2256->dev, &dev_attr_version); } static const struct of_device_id pef2256_id_table[] = { diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 995a7207bdf8..f357a7ac70ac 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -81,7 +81,7 @@ static struct lapbethdev *lapbeth_get_x25_dev(struct net_device *dev) static __inline__ int dev_is_ethdev(struct net_device *dev) { - return dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5); + return dev->type == ARPHRD_ETHER && !netdev_need_ops_lock(dev); } /* ------------------------------------------------------------------------ */ |