X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb%2Fdvb-core%2Fdvb_ca_en50221.h;h=8458f7afdadbc28a76bc3de7cd272759e8c5b935;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=8467e63ddc0d256c2dda250f49786979f06e53b6;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h b/drivers/media/dvb/dvb-core/dvb_ca_en50221.h index 8467e63dd..8458f7afd 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.h +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.h @@ -42,12 +42,6 @@ /* Structure describing a CA interface */ struct dvb_ca_en50221 { - /* the module owning this structure */ - struct module* owner; - - /* NOTE: the read_*, write_* and poll_slot_status functions must use locks as - * they may be called from several threads at once */ - /* functions for accessing attribute memory on the CAM */ int (*read_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address); int (*write_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address, u8 value); @@ -65,7 +59,7 @@ struct dvb_ca_en50221 { * Poll slot status. * Only necessary if DVB_CA_FLAG_EN50221_IRQ_CAMCHANGE is not set */ - int (*poll_slot_status)(struct dvb_ca_en50221* ca, int slot, int open); + int (*poll_slot_status)(struct dvb_ca_en50221* ca, int slot); /* private data, used by caller */ void* data;