mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 18:57:47 +07:00
Staging: go7007: fix build issues
Now that TUNER_SET_TYPE_ADDR is gone from the tree, the older code kicks in and tries to use TUNER_SET_TYPE, which went away a long time ago. This patch removes all of this logic, as it should not be needed anymore now, and by doing so, fixes the build. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
b824adc968
commit
86a79d2e70
@ -268,21 +268,6 @@ int go7007_register_encoder(struct go7007 *go)
|
||||
init_i2c_module(&go->i2c_adapter,
|
||||
go->board_info->i2c_devs[i].id,
|
||||
go->board_info->i2c_devs[i].addr);
|
||||
#ifdef TUNER_SET_TYPE_ADDR
|
||||
if (go->tuner_type >= 0) {
|
||||
struct tuner_setup tun_setup = {
|
||||
.mode_mask = T_ANALOG_TV,
|
||||
.addr = ADDR_UNSET,
|
||||
.type = go->tuner_type
|
||||
};
|
||||
i2c_clients_command(&go->i2c_adapter,
|
||||
TUNER_SET_TYPE_ADDR, &tun_setup);
|
||||
}
|
||||
#else
|
||||
if (go->tuner_type >= 0)
|
||||
i2c_clients_command(&go->i2c_adapter,
|
||||
TUNER_SET_TYPE, &go->tuner_type);
|
||||
#endif
|
||||
if (go->board_id == GO7007_BOARDID_ADLINK_MPG24)
|
||||
i2c_clients_command(&go->i2c_adapter,
|
||||
DECODER_SET_CHANNEL, &go->channel_number);
|
||||
|
@ -386,6 +386,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
|
||||
struct wis_sony_tuner *t = i2c_get_clientdata(client);
|
||||
|
||||
switch (cmd) {
|
||||
#if 0
|
||||
#ifdef TUNER_SET_TYPE_ADDR
|
||||
case TUNER_SET_TYPE_ADDR:
|
||||
{
|
||||
@ -463,6 +464,7 @@ static int tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
|
||||
t->type, sony_tuners[t->type - 200].name);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
case VIDIOC_G_FREQUENCY:
|
||||
{
|
||||
struct v4l2_frequency *f = arg;
|
||||
|
Loading…
Reference in New Issue
Block a user