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

!15620 s390/ism: add release function for struct device 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Kai <liukai284@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/F6FX3FXNG6PH7K26FZOMXAFQDUFGPKKJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBSW0X 
 
Link:https://gitee.com/openeuler/kernel/pulls/15620

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 3a9f4565 765bc5ec

drivers/s390/net/ism_drv.c

+12 −2
Original line number Diff line number Diff line
@@ -588,6 +588,15 @@ static int ism_dev_init(struct ism_dev *ism) 
	return ret;

}



static void ism_dev_release(struct device *dev)

{

	struct ism_dev *ism;



	ism = container_of(dev, struct ism_dev, dev);



	kfree(ism);

}



static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct ism_dev *ism;
@@ -601,6 +610,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	dev_set_drvdata(&pdev->dev, ism);

	ism->pdev = pdev;

	ism->dev.parent = &pdev->dev;

	ism->dev.release = ism_dev_release;

	device_initialize(&ism->dev);

	dev_set_name(&ism->dev, dev_name(&pdev->dev));

	ret = device_add(&ism->dev);
@@ -637,7 +647,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	device_del(&ism->dev);

err_dev:

	dev_set_drvdata(&pdev->dev, NULL);

	kfree(ism);

	put_device(&ism->dev);



	return ret;

}
@@ -682,7 +692,7 @@ static void ism_remove(struct pci_dev *pdev) 
	pci_disable_device(pdev);

	device_del(&ism->dev);

	dev_set_drvdata(&pdev->dev, NULL);

	kfree(ism);

	put_device(&ism->dev);

}



static struct pci_driver ism_driver = {