Unverified Commit dc277c52 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9013 net: encx24j600: check error in devm_regmap_init_encx24j600 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4KQ4L43S6MQPKGCKDM2AKOW6PNPLKZ4L/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RBIY 
 
Link:https://gitee.com/openeuler/kernel/pulls/9013

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 68e31dbd a543f079

drivers/net/ethernet/microchip/encx24j600-regmap.c

+8 −2
Original line number Diff line number Diff line
@@ -505,13 +505,19 @@ static struct regmap_bus phymap_encx24j600 = { 
	.reg_read = regmap_encx24j600_phy_reg_read,

};



void devm_regmap_init_encx24j600(struct device *dev,

int devm_regmap_init_encx24j600(struct device *dev,

				struct encx24j600_context *ctx)

{

	mutex_init(&ctx->mutex);

	regcfg.lock_arg = ctx;

	ctx->regmap = devm_regmap_init(dev, &regmap_encx24j600, ctx, &regcfg);

	if (IS_ERR(ctx->regmap))

		return PTR_ERR(ctx->regmap);

	ctx->phymap = devm_regmap_init(dev, &phymap_encx24j600, ctx, &phycfg);

	if (IS_ERR(ctx->phymap))

		return PTR_ERR(ctx->phymap);



	return 0;

}

EXPORT_SYMBOL_GPL(devm_regmap_init_encx24j600);

drivers/net/ethernet/microchip/encx24j600.c

+4 −1
Original line number Diff line number Diff line
@@ -1032,10 +1032,13 @@ static int encx24j600_spi_probe(struct spi_device *spi) 
	priv->speed = SPEED_100;



	priv->ctx.spi = spi;

	devm_regmap_init_encx24j600(&spi->dev, &priv->ctx);

	ndev->irq = spi->irq;

	ndev->netdev_ops = &encx24j600_netdev_ops;



	ret = devm_regmap_init_encx24j600(&spi->dev, &priv->ctx);

	if (ret)

		goto out_free;



	mutex_init(&priv->lock);



	/* Reset device and check if it is connected */

drivers/net/ethernet/microchip/encx24j600_hw.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct encx24j600_context { 
	int bank;

};



void devm_regmap_init_encx24j600(struct device *dev,

int devm_regmap_init_encx24j600(struct device *dev,

				struct encx24j600_context *ctx);



/* Single-byte instructions */