leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: dvb_ca_en50221: New function dvb_ca_en50221_poll_cam_gone

Browse Source 
The CAM poll code for the budget-av is exactly the same on several
places. Extracting the code to a new function improves maintainability.

Signed-off-by: Jasmin Jessich <jasmin@anw.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Jasmin Jessich 2017-07-15 20:43:03 -04:00 committed by Mauro Carvalho Chehab
parent a004b70e70
commit 5d023252cb
1 changed files with 35 additions and 31 deletions

66
drivers/media/dvb-core/dvb_ca_en50221.c
View File

@ -1063,6 +1063,37 @@ static void dvb_ca_en50221_thread_update_delay(struct dvb_ca_private *ca)
ca->delay = curdelay; ca->delay = curdelay;
} }
/**
* Poll if the CAM is gone.
*
* @ca: CA instance.
* @slot: Slot to process.
* @return: 0 .. no change
* 1 .. CAM state changed
*/
static int dvb_ca_en50221_poll_cam_gone(struct dvb_ca_private *ca, int slot)
{
int changed = 0;
int status;
/*
* we need this extra check for annoying interfaces like the
* budget-av
*/
if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &&
(ca->pub->poll_slot_status)) {
status = ca->pub->poll_slot_status(ca->pub, slot, 0);
if (!(status &
DVB_CA_EN50221_POLL_CAM_PRESENT)) {
ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;
dvb_ca_en50221_thread_update_delay(ca);
changed = 1;
}
}
return changed;
}
/** /**
* Thread state machine for one CA slot to perform the data transfer. * Thread state machine for one CA slot to perform the data transfer.
* *
@ -1074,7 +1105,6 @@ static void dvb_ca_en50221_thread_state_machine(struct dvb_ca_private *ca,
{ {
struct dvb_ca_slot *sl = &ca->slot_info[slot]; struct dvb_ca_slot *sl = &ca->slot_info[slot];
int flags; int flags;
int status;
int pktcount; int pktcount;
void *rxbuf; void *rxbuf;
@ -1124,21 +1154,8 @@ static void dvb_ca_en50221_thread_state_machine(struct dvb_ca_private *ca,
case DVB_CA_SLOTSTATE_VALIDATE: case DVB_CA_SLOTSTATE_VALIDATE:
if (dvb_ca_en50221_parse_attributes(ca, slot) != 0) { if (dvb_ca_en50221_parse_attributes(ca, slot) != 0) {
/* if (dvb_ca_en50221_poll_cam_gone(ca, slot))
* we need this extra check for annoying interfaces like break;
* the budget-av
*/
if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
&& (ca->pub->poll_slot_status)) {
status = ca->pub->poll_slot_status(ca->pub,
slot, 0);
if (!(status &
DVB_CA_EN50221_POLL_CAM_PRESENT)) {
sl->slot_state = DVB_CA_SLOTSTATE_NONE;
dvb_ca_en50221_thread_update_delay(ca);
break;
}
}
pr_err("dvb_ca adapter %d: Invalid PC card inserted :(\n", pr_err("dvb_ca adapter %d: Invalid PC card inserted :(\n",
ca->dvbdev->adapter->num); ca->dvbdev->adapter->num);
@ -1187,21 +1204,8 @@ static void dvb_ca_en50221_thread_state_machine(struct dvb_ca_private *ca,
case DVB_CA_SLOTSTATE_LINKINIT: case DVB_CA_SLOTSTATE_LINKINIT:
if (dvb_ca_en50221_link_init(ca, slot) != 0) { if (dvb_ca_en50221_link_init(ca, slot) != 0) {
/* if (dvb_ca_en50221_poll_cam_gone(ca, slot))
* we need this extra check for annoying interfaces like break;
* the budget-av
*/
if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE))
&& (ca->pub->poll_slot_status)) {
status = ca->pub->poll_slot_status(ca->pub,
slot, 0);
if (!(status &
DVB_CA_EN50221_POLL_CAM_PRESENT)) {
sl->slot_state = DVB_CA_SLOTSTATE_NONE;
dvb_ca_en50221_thread_update_delay(ca);
break;
}
}
pr_err("dvb_ca adapter %d: DVB CAM link initialisation failed :(\n", pr_err("dvb_ca adapter %d: DVB CAM link initialisation failed :(\n",
ca->dvbdev->adapter->num); ca->dvbdev->adapter->num);