diff options
| -rw-r--r-- | drivers/crypto/tegra/tegra-se-main.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/drm.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/host1x/bus.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/tegra-video/video.c | 4 | ||||
| -rw-r--r-- | include/linux/host1x.h | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/drivers/crypto/tegra/tegra-se-main.c b/drivers/crypto/tegra/tegra-se-main.c index 7237f14eaf5a..4e7115b247e7 100644 --- a/drivers/crypto/tegra/tegra-se-main.c +++ b/drivers/crypto/tegra/tegra-se-main.c @@ -401,11 +401,9 @@ static int tegra_se_host1x_probe(struct host1x_device *dev) return host1x_device_init(dev); } -static int tegra_se_host1x_remove(struct host1x_device *dev) +static void tegra_se_host1x_remove(struct host1x_device *dev) { host1x_device_exit(dev); - - return 0; } static struct host1x_driver tegra_se_host1x_driver = { diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 1d18d43292dc..f7222819d672 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1301,7 +1301,7 @@ put: return err; } -static int host1x_drm_remove(struct host1x_device *dev) +static void host1x_drm_remove(struct host1x_device *dev) { struct drm_device *drm = dev_get_drvdata(&dev->dev); struct tegra_drm *tegra = drm->dev_private; @@ -1330,8 +1330,6 @@ static int host1x_drm_remove(struct host1x_device *dev) kfree(tegra); drm_dev_put(drm); - - return 0; } static void host1x_drm_shutdown(struct host1x_device *dev) diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index 723a80895cd4..ceb8212fa8c9 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c @@ -640,7 +640,7 @@ static int host1x_device_remove(struct device *dev) struct host1x_device *device = to_host1x_device(dev); if (driver->remove) - return driver->remove(device); + driver->remove(device); return 0; } diff --git a/drivers/staging/media/tegra-video/video.c b/drivers/staging/media/tegra-video/video.c index 074ad0dc56ca..68783d5ffeb1 100644 --- a/drivers/staging/media/tegra-video/video.c +++ b/drivers/staging/media/tegra-video/video.c @@ -107,7 +107,7 @@ cleanup: return ret; } -static int host1x_video_remove(struct host1x_device *dev) +static void host1x_video_remove(struct host1x_device *dev) { struct tegra_video_device *vid = dev_get_drvdata(&dev->dev); @@ -118,8 +118,6 @@ static int host1x_video_remove(struct host1x_device *dev) /* This calls v4l2_dev release callback on last reference */ v4l2_device_put(&vid->v4l2_dev); - - return 0; } static const struct of_device_id host1x_video_subdevs[] = { diff --git a/include/linux/host1x.h b/include/linux/host1x.h index 9fa9c30a34e6..5e7a63143a4a 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -380,7 +380,7 @@ struct host1x_driver { struct list_head list; int (*probe)(struct host1x_device *device); - int (*remove)(struct host1x_device *device); + void (*remove)(struct host1x_device *device); void (*shutdown)(struct host1x_device *device); }; |