Commit 2ede79a6 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

coresight: Remove name from platform description 



We are about to use a name independent of the parent AMBA device
name. As such, there is no need to have it in the platform description.
Let us move this to coresight description instead.

Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aff70a45

drivers/hwtracing/coresight/coresight-catu.c

+2 −0
Original line number Diff line number Diff line
@@ -551,6 +551,8 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id) 
	catu_desc.type = CORESIGHT_DEV_TYPE_HELPER;

	catu_desc.subtype.helper_subtype = CORESIGHT_DEV_SUBTYPE_HELPER_CATU;

	catu_desc.ops = &catu_ops;

	catu_desc.name = dev_name(dev);



	drvdata->csdev = coresight_register(&catu_desc);

	if (IS_ERR(drvdata->csdev))

		ret = PTR_ERR(drvdata->csdev);

drivers/hwtracing/coresight/coresight-etb10.c

+2 −1
Original line number Diff line number Diff line
@@ -777,12 +777,13 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.ops = &etb_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.name = dev_name(dev);

	desc.groups = coresight_etb_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev))

		return PTR_ERR(drvdata->csdev);



	drvdata->miscdev.name = pdata->name;

	drvdata->miscdev.name = desc.name;

	drvdata->miscdev.minor = MISC_DYNAMIC_MINOR;

	drvdata->miscdev.fops = &etb_fops;

	ret = misc_register(&drvdata->miscdev);

drivers/hwtracing/coresight/coresight-etm3x.c

+1 −0
Original line number Diff line number Diff line
@@ -854,6 +854,7 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.ops = &etm_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.name = dev_name(dev);

	desc.groups = coresight_etm_groups;

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

drivers/hwtracing/coresight/coresight-etm4x.c

+1 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) 
	desc.pdata = pdata;

	desc.dev = dev;

	desc.groups = coresight_etmv4_groups;

	desc.name = dev_name(dev);

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

drivers/hwtracing/coresight/coresight-funnel.c

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static int funnel_probe(struct device *dev, struct resource *res) 
	desc.ops = &funnel_cs_ops;

	desc.pdata = pdata;

	desc.dev = dev;

	desc.name = dev_name(dev);

	drvdata->csdev = coresight_register(&desc);

	if (IS_ERR(drvdata->csdev)) {

		ret = PTR_ERR(drvdata->csdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE