Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions drivers/gpu/drm/panel/panel-samsung-cmc6230r.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ static int cmc623_i2c_probe(struct i2c_client *client,
return err;
}

static int cmc623_i2c_remove(struct i2c_client *client)
static void cmc623_i2c_remove(struct i2c_client *client)
{
struct cmc623_data *data = i2c_get_clientdata(client);

Expand All @@ -622,8 +622,6 @@ static int cmc623_i2c_remove(struct i2c_client *client)
drm_panel_remove(&data->panel);

mutex_destroy(&data->tuning_mutex);

return 0;
}

static const struct i2c_device_id cmc623_id[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/leds/leds-isa1200.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ static int isa1200_vibrator_i2c_probe(struct i2c_client *client,

}

static int isa1200_vibrator_i2c_remove(struct i2c_client *client)
static void isa1200_vibrator_i2c_remove(struct i2c_client *client)
{
struct isa1200_vibrator_drvdata *ddata = i2c_get_clientdata(client);
struct led_classdev *led_cdev = &ddata->cdev;
Expand All @@ -497,8 +497,6 @@ static int isa1200_vibrator_i2c_remove(struct i2c_client *client)
ddata->wq = NULL;

kfree(ddata);

return 0;
}

#if 0
Expand Down
22 changes: 11 additions & 11 deletions scripts/Makefile.modpost
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@ ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),)
modpost-args += -n
endif

ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)
modpost-args += -w
endif

# Read out modules.order to pass in modpost.
# Otherwise, allmodconfig would fail with "Argument list too long".
ifdef KBUILD_MODULES
modpost-args += -T $(MODORDER)
modpost-deps += $(MODORDER)
endif

ifeq ($(KBUILD_EXTMOD),)

# Generate the list of in-tree objects in vmlinux
Expand Down Expand Up @@ -113,17 +124,6 @@ modpost-args += -e $(addprefix -i , $(KBUILD_EXTRA_SYMBOLS))

endif # ($(KBUILD_EXTMOD),)

ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)
modpost-args += -w
endif

ifdef KBUILD_MODULES
modpost-args += -T $(MODORDER)
modpost-deps += $(MODORDER)
endif

# Read out modules.order to pass in modpost.
# Otherwise, allmodconfig would fail with "Argument list too long".
quiet_cmd_modpost = MODPOST $@
cmd_modpost = \
$(if $(missing-input), \
Expand Down