From 9299a04997454c0348918642006922cfb7c014ea Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 14 Apr 2014 12:56:34 +0200 Subject: driver core: dev_set_drvdata returns void dev_set_drvdata can no longer fail, so it could return void. All callers have hopefully been updated to no longer check for the return value. [apq8084: fix callers still expecting a return value] Change-Id: I5e8995b0783727139901dcc7a810e8d0d39a0eed Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/base/dd.c | 3 +-- drivers/iommu/exynos-iommu.c | 6 +----- drivers/vfio/vfio.c | 6 +----- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'drivers') diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 79a4fd154..83a797e0d 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -605,7 +605,7 @@ void *dev_get_drvdata(const struct device *dev) } EXPORT_SYMBOL(dev_get_drvdata); -int dev_set_drvdata(struct device *dev, void *data) +void dev_set_drvdata(struct device *dev, void *data) { int error; @@ -615,6 +615,5 @@ int dev_set_drvdata(struct device *dev, void *data) return error; } dev->p->driver_data = data; - return 0; } EXPORT_SYMBOL(dev_set_drvdata); diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 3f32d64ab..43b089d95 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -586,11 +586,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) goto err_alloc; } - ret = dev_set_drvdata(dev, data); - if (ret) { - dev_dbg(dev, "Unabled to initialize driver data\n"); - goto err_init; - } + dev_set_drvdata(dev, data); data->nsfrs = pdev->num_resources / 2; data->sfrbases = kmalloc(sizeof(*data->sfrbases) * data->nsfrs, diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 6d7873656..2500fad4e 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -360,11 +360,7 @@ struct vfio_device *vfio_group_create_device(struct vfio_group *group, device->ops = ops; device->device_data = device_data; - ret = dev_set_drvdata(dev, device); - if (ret) { - kfree(device); - return ERR_PTR(ret); - } + dev_set_drvdata(dev, device); /* No need to get group_lock, caller has group reference */ vfio_group_get(group); -- cgit v1.2.3