Skip to content

Fix compilation error for rk628 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marfrit wants to merge 1 commit into
base: linux-6.1-stan-rkr1
Choose a base branch
from
Open

Fix compilation error for rk628 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/misc/rk628/rk628.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ rk628_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)
return 0;
}

static int rk628_i2c_remove(struct i2c_client *client)
static void rk628_i2c_remove(struct i2c_client *client)
{
struct rk628 *rk628 = i2c_get_clientdata(client);
struct device *dev = &client->dev;
Expand All @@ -1234,8 +1234,6 @@ static int rk628_i2c_remove(struct i2c_client *client)
cancel_delayed_work_sync(&rk628->delay_work);
destroy_workqueue(rk628->monitor_wq);
pm_runtime_disable(dev);

return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/rk628/rk628_hdmitx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ static int rk628_hdmi_connector_get_modes(struct drm_connector *connector)

ret = rockchip_drm_add_modes_noedid(connector);

info->edid_hdmi_dc_modes = 0;
info->edid_hdmi_rgb444_dc_modes = 0;
info->hdmi.y420_dc_modes = 0;
info->color_formats = 0;

Expand Down