diff options
| -rw-r--r-- | drivers/base/dd.c | 3 | ||||
| -rw-r--r-- | drivers/iommu/exynos-iommu.c | 6 | ||||
| -rw-r--r-- | drivers/vfio/vfio.c | 6 | ||||
| -rw-r--r-- | include/linux/device.h | 2 |
4 files changed, 4 insertions, 13 deletions
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); diff --git a/include/linux/device.h b/include/linux/device.h index 0f90d5f47..4acc80fda 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -860,7 +860,7 @@ extern const char *device_get_devnode(struct device *dev, umode_t *mode, kuid_t *uid, kgid_t *gid, const char **tmp); extern void *dev_get_drvdata(const struct device *dev); -extern int dev_set_drvdata(struct device *dev, void *data); +extern void dev_set_drvdata(struct device *dev, void *data); /* * Root device objects for grouping under /sys/devices |