Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] dvb_ca_en50221.h: Make checkpatch.pl happy

There are several CodingStyle violations at the DVB code. While
we won't be fixing them as a hole, let's fix at least the
headers, as we're touching on them already in order to properly
document them.

No functional changes.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

+29 -33
+29 -33
drivers/media/dvb-core/dvb_ca_en50221.h
··· 12 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 14 * GNU General Public License for more details. 15 - * 16 - * You should have received a copy of the GNU Lesser General Public License 17 - * along with this program; if not, write to the Free Software 18 - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 19 15 */ 20 16 21 17 #ifndef _DVB_CA_EN50221_H_ ··· 32 36 33 37 #define DVB_CA_EN50221_CAMCHANGE_REMOVED 0 34 38 #define DVB_CA_EN50221_CAMCHANGE_INSERTED 1 35 - 36 - 37 39 38 40 /** 39 41 * struct dvb_ca_en50221- Structure describing a CA interface ··· 54 60 * and if appropriate. There will be no concurrent access to one slot. 55 61 */ 56 62 struct dvb_ca_en50221 { 63 + struct module *owner; 57 64 65 + int (*read_attribute_mem)(struct dvb_ca_en50221 *ca, 66 + int slot, int address); 67 + int (*write_attribute_mem)(struct dvb_ca_en50221 *ca, 68 + int slot, int address, u8 value); 58 69 70 + int (*read_cam_control)(struct dvb_ca_en50221 *ca, 71 + int slot, u8 address); 72 + int (*write_cam_control)(struct dvb_ca_en50221 *ca, 73 + int slot, u8 address, u8 value); 59 74 60 - int (*write_attribute_mem)(struct dvb_ca_en50221* ca, int slot, int address, u8 value); 75 + int (*slot_reset)(struct dvb_ca_en50221 *ca, int slot); 76 + int (*slot_shutdown)(struct dvb_ca_en50221 *ca, int slot); 77 + int (*slot_ts_enable)(struct dvb_ca_en50221 *ca, int slot); 61 78 62 - int (*read_cam_control)(struct dvb_ca_en50221* ca, int slot, u8 address); 63 - int (*write_cam_control)(struct dvb_ca_en50221* ca, int slot, u8 address, u8 value); 79 + int (*poll_slot_status)(struct dvb_ca_en50221 *ca, int slot, int open); 64 80 65 - int (*slot_reset)(struct dvb_ca_en50221* ca, int slot); 66 - int (*slot_shutdown)(struct dvb_ca_en50221* ca, int slot); 67 - int (*slot_ts_enable)(struct dvb_ca_en50221* ca, int slot); 81 + void *data; 68 82 69 - int (*poll_slot_status)(struct dvb_ca_en50221* ca, int slot, int open); 70 - 71 - void* data; 72 - 73 - void* private; 83 + void *private; 74 84 }; 75 85 76 - 77 - 78 - 79 - /* ******************************************************************************** */ 80 - /* Functions for reporting IRQ events */ 86 + /* 87 + * Functions for reporting IRQ events 88 + */ 81 89 82 90 /** 83 91 * dvb_ca_en50221_camchange_irq - A CAMCHANGE IRQ has occurred. ··· 88 92 * @slot: Slot concerned. 89 93 * @change_type: One of the DVB_CA_CAMCHANGE_* values 90 94 */ 91 - void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221* pubca, int slot, int change_type); 95 + void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221 *pubca, int slot, 96 + int change_type); 92 97 93 98 /** 94 99 * dvb_ca_en50221_camready_irq - A CAMREADY IRQ has occurred. ··· 97 100 * @pubca: CA instance. 98 101 * @slot: Slot concerned. 99 102 */ 100 - void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221* pubca, int slot); 103 + void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot); 101 104 102 105 /** 103 106 * dvb_ca_en50221_frda_irq - An FR or a DA IRQ has occurred. ··· 105 108 * @ca: CA instance. 106 109 * @slot: Slot concerned. 107 110 */ 108 - void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221* ca, int slot); 111 + void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *ca, int slot); 109 112 110 - 111 - 112 - /* ******************************************************************************** */ 113 - /* Initialisation/shutdown functions */ 113 + /* 114 + * Initialisation/shutdown functions 115 + */ 114 116 115 117 /** 116 118 * dvb_ca_en50221_init - Initialise a new DVB CA device. ··· 121 125 * 122 126 * @return 0 on success, nonzero on failure 123 127 */ 124 - extern int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, struct dvb_ca_en50221* ca, int flags, int slot_count); 128 + extern int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter, 129 + struct dvb_ca_en50221 *ca, int flags, 130 + int slot_count); 125 131 126 132 /** 127 133 * dvb_ca_en50221_release - Release a DVB CA device. 128 134 * 129 135 * @ca: The associated dvb_ca instance. 130 136 */ 131 - extern void dvb_ca_en50221_release(struct dvb_ca_en50221* ca); 132 - 133 - 137 + extern void dvb_ca_en50221_release(struct dvb_ca_en50221 *ca); 134 138 135 139 #endif