Commit 6705a9cc authored by Manjunatha Halli's avatar Manjunatha Halli Committed by Mauro Carvalho Chehab

[media] radio: wl128x: Update registration process with ST

As underlying ST driver registration API's have changed with
latest 2.6.38-rc8 kernel this patch will update the FM driver
accordingly.
Signed-off-by: default avatarManjunatha Halli <manjunatha_halli@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 92ce5269
......@@ -1494,12 +1494,17 @@ u32 fmc_prepare(struct fmdev *fmdev)
}
memset(&fm_st_proto, 0, sizeof(fm_st_proto));
fm_st_proto.type = ST_FM;
fm_st_proto.recv = fm_st_receive;
fm_st_proto.match_packet = NULL;
fm_st_proto.reg_complete_cb = fm_st_reg_comp_cb;
fm_st_proto.write = NULL; /* TI ST driver will fill write pointer */
fm_st_proto.priv_data = fmdev;
fm_st_proto.chnl_id = 0x08;
fm_st_proto.max_frame_size = 0xff;
fm_st_proto.hdr_len = 1;
fm_st_proto.offset_len_in_hdr = 0;
fm_st_proto.len_size = 1;
fm_st_proto.reserve = 1;
ret = st_register(&fm_st_proto);
if (ret == -EINPROGRESS) {
......@@ -1532,7 +1537,7 @@ u32 fmc_prepare(struct fmdev *fmdev)
g_st_write = fm_st_proto.write;
} else {
fmerr("Failed to get ST write func pointer\n");
ret = st_unregister(ST_FM);
ret = st_unregister(&fm_st_proto);
if (ret < 0)
fmerr("st_unregister failed %d\n", ret);
return -EAGAIN;
......@@ -1586,6 +1591,7 @@ u32 fmc_prepare(struct fmdev *fmdev)
*/
u32 fmc_release(struct fmdev *fmdev)
{
static struct st_proto_s fm_st_proto;
u32 ret;
if (!test_bit(FM_CORE_READY, &fmdev->flag)) {
......@@ -1604,7 +1610,11 @@ u32 fmc_release(struct fmdev *fmdev)
fmdev->resp_comp = NULL;
fmdev->rx.freq = 0;
ret = st_unregister(ST_FM);
memset(&fm_st_proto, 0, sizeof(fm_st_proto));
fm_st_proto.chnl_id = 0x08;
ret = st_unregister(&fm_st_proto);
if (ret < 0)
fmerr("Failed to de-register FM from ST %d\n", ret);
else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment