Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a49e4838 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: line6: coding style cleanups for .h files. 



Mostly all line length issues.
Skipped the control.h file as it makes sense to leave it alone.

Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 536165d8

drivers/staging/line6/capture.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,8 @@ extern struct snd_pcm_ops snd_line6_capture_ops; 








extern int create_audio_in_urbs(struct snd_line6_pcm *line6pcm);

extern int create_audio_in_urbs(struct snd_line6_pcm *line6pcm);

extern int snd_line6_capture_trigger(struct snd_pcm_substream *substream, int cmd);

extern int snd_line6_capture_trigger(struct snd_pcm_substream *substream,

				     int cmd);

extern void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm);

extern void unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm *line6pcm);

drivers/staging/line6/config.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,8 @@ 
#define CREATE_RAW_FILE      0

#define CREATE_RAW_FILE      0





#if DO_DEBUG_MESSAGES

#if DO_DEBUG_MESSAGES

#define CHECKPOINT printk("line6usb: %s (%s:%d)\n", __FUNCTION__, __FILE__, __LINE__)

#define CHECKPOINT printk(KERN_INFO "line6usb: %s (%s:%d)\n", \

			  __func__, __FILE__, __LINE__)

#endif

#endif





#if DO_DEBUG_MESSAGES

#if DO_DEBUG_MESSAGES

drivers/staging/line6/driver.h

+34 −14
Original line number Original line Diff line number Diff line
@@ -55,10 +55,17 @@ 
#define LINE6_CHANNEL_MASK 0x0f

#define LINE6_CHANNEL_MASK 0x0f









#define MISSING_CASE printk("line6usb driver bug: missing case in %s:%d\n", __FILE__, __LINE__)

#define MISSING_CASE	\

	printk(KERN_ERR "line6usb driver bug: missing case in %s:%d\n", \

		__FILE__, __LINE__)









#define CHECK_RETURN(x) if((err = x) < 0) return err

#define CHECK_RETURN(x)		\

do {				\

	err = x;		\

	if (err < 0)		\

		return err;	\

} while (0)









extern const unsigned char line6_midi_id[3];

extern const unsigned char line6_midi_id[3];
@@ -166,19 +173,32 @@ struct usb_line6 { 
};

};









extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1, int code2, int size);

extern char *line6_alloc_sysex_buffer(struct usb_line6 *line6, int code1,

extern ssize_t line6_nop_read(struct device *dev, struct device_attribute *attr, char *buf);

				      int code2, int size);

extern ssize_t line6_nop_write(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);

extern ssize_t line6_nop_read(struct device *dev,

extern int line6_read_data(struct usb_line6 *line6, int address, void *data, size_t datalen);

			      struct device_attribute *attr, char *buf);

extern int line6_read_serial_number(struct usb_line6 *line6, int *serial_number);

extern ssize_t line6_nop_write(struct device *dev,

			       struct device_attribute *attr,

			       const char *buf, size_t count);

extern int line6_read_data(struct usb_line6 *line6, int address, void *data,

			   size_t datalen);

extern int line6_read_serial_number(struct usb_line6 *line6,

				    int *serial_number);

extern int line6_send_program(struct usb_line6 *line6, int value);

extern int line6_send_program(struct usb_line6 *line6, int value);

extern int line6_send_raw_message(struct usb_line6 *line6, const char *buffer, int size);

extern int line6_send_raw_message(struct usb_line6 *line6, const char *buffer,

extern int line6_send_raw_message_async(struct usb_line6 *line6, const char *buffer, int size);

				  int size);

extern int line6_send_sysex_message(struct usb_line6 *line6, const char *buffer, int size);

extern int line6_send_raw_message_async(struct usb_line6 *line6,

extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);

					const char *buffer, int size);

extern int line6_transmit_parameter(struct usb_line6 *line6, int param, int value);

extern int line6_send_sysex_message(struct usb_line6 *line6,

extern int line6_write_data(struct usb_line6 *line6, int address, void *data, size_t datalen);

				    const char *buffer, int size);

extern void line6_write_hexdump(struct usb_line6 *line6, char dir, const unsigned char *buffer, int size);

extern ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr,

			     const char *buf, size_t count);

extern int line6_transmit_parameter(struct usb_line6 *line6, int param,

				    int value);

extern int line6_write_data(struct usb_line6 *line6, int address, void *data,

			    size_t datalen);

extern void line6_write_hexdump(struct usb_line6 *line6, char dir,

				const unsigned char *buffer, int size);









#endif
 
#endif

drivers/staging/line6/dumprequest.h

+7 −4
Original line number Original line Diff line number Diff line
@@ -72,12 +72,15 @@ struct line6_dump_request { 
};

};





extern void line6_dump_finished(struct line6_dump_request *l6dr);

extern void line6_dump_finished(struct line6_dump_request *l6dr);

extern int line6_dump_request_async(struct line6_dump_request *l6dr, struct usb_line6 *line6, int num);

extern int line6_dump_request_async(struct line6_dump_request *l6dr,

				    struct usb_line6 *line6, int num);

extern void line6_dump_started(struct line6_dump_request *l6dr, int dest);

extern void line6_dump_started(struct line6_dump_request *l6dr, int dest);

extern void line6_dumpreq_destruct(struct line6_dump_request *l6dr);

extern void line6_dumpreq_destruct(struct line6_dump_request *l6dr);

extern void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num);

extern void line6_dumpreq_destructbuf(struct line6_dump_request *l6dr, int num);

extern int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf, size_t len);

extern int line6_dumpreq_init(struct line6_dump_request *l6dr, const void *buf,

extern int line6_dumpreq_initbuf(struct line6_dump_request *l6dr, const void *buf, size_t len, int num);

			      size_t len);

extern int line6_dumpreq_initbuf(struct line6_dump_request *l6dr,

				 const void *buf, size_t len, int num);

extern void line6_invalidate_current(struct line6_dump_request *l6dr);

extern void line6_invalidate_current(struct line6_dump_request *l6dr);

extern void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds,

extern void line6_startup_delayed(struct line6_dump_request *l6dr, int seconds,

				  void (*function)(unsigned long), void *data);

				  void (*function)(unsigned long), void *data);

drivers/staging/line6/midi.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -21,8 +21,7 @@ 
#define MIDI_BUFFER_SIZE 1024

#define MIDI_BUFFER_SIZE 1024









struct snd_line6_midi

struct snd_line6_midi {

{

	/**

	/**

		 Pointer back to the Line6 driver data structure.

		 Pointer back to the Line6 driver data structure.

	*/

	*/
@@ -81,7 +80,8 @@ struct snd_line6_midi 








extern int line6_init_midi(struct usb_line6 *line6);

extern int line6_init_midi(struct usb_line6 *line6);

extern void line6_midi_receive(struct usb_line6 *line6, unsigned char *data, int length);

extern void line6_midi_receive(struct usb_line6 *line6, unsigned char *data,

			       int length);









#endif
 
#endif