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

Commit dafc456c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] cx25821: get rid of warning: no previous prototype 



drivers/media/pci/cx25821/cx25821-audio-upstream.c:136:5: warning: no previous prototype for 'cx25821_risc_buffer_upstream_audio' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-audio-upstream.c:200:6: warning: no previous prototype for 'cx25821_free_memory_audio' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-audio-upstream.c:259:5: warning: no previous prototype for 'cx25821_get_audio_data' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-audio-upstream.c:354:5: warning: no previous prototype for 'cx25821_openfile_audio' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-audio-upstream.c:47:5: warning: no previous prototype for 'cx25821_sram_channel_setup_upstream_audio' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-audio-upstream.c:493:5: warning: no previous prototype for 'cx25821_audio_upstream_irq' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-audio-upstream.c:637:5: warning: no previous prototype for 'cx25821_start_audio_dma_upstream' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-biffuncs.h:28:11: warning: no previous prototype for 'getBit' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-biffuncs.h:33:12: warning: no previous prototype for 'clearBitAtPos' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-biffuncs.h:38:12: warning: no previous prototype for 'setBitAtPos' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-i2c.c:332:6: warning: no previous prototype for 'cx25821_av_clk' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video.c:294:5: warning: no previous prototype for 'cx25821_restart_video_queue' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video.c:345:6: warning: no previous prototype for 'cx25821_vid_timeout' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:176:5: warning: no previous prototype for 'cx25821_risc_buffer_upstream' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:303:5: warning: no previous prototype for 'cx25821_get_frame' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:408:5: warning: no previous prototype for 'cx25821_openfile' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:489:5: warning: no previous prototype for 'cx25821_upstream_buffer_prepare' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:551:5: warning: no previous prototype for 'cx25821_video_upstream_irq' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:667:6: warning: no previous prototype for 'cx25821_set_pixelengine' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream.c:699:5: warning: no previous prototype for 'cx25821_start_video_dma_upstream' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c:126:5: warning: no previous prototype for 'cx25821_risc_buffer_upstream_ch2' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c:258:5: warning: no previous prototype for 'cx25821_get_frame_ch2' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c:363:5: warning: no previous prototype for 'cx25821_openfile_ch2' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c:510:5: warning: no previous prototype for 'cx25821_video_upstream_irq_ch2' [-Wmissing-prototypes]
drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c:650:5: warning: no previous prototype for 'cx25821_start_video_dma_upstream_ch2' [-Wmissing-prototypes]

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a041e103

drivers/media/pci/cx25821/cx25821-audio-upstream.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ MODULE_LICENSE("GPL"); 
static int _intr_msk = FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF |

static int _intr_msk = FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF |

			FLD_AUD_SRC_SYNC | FLD_AUD_SRC_OPC_ERR;

			FLD_AUD_SRC_SYNC | FLD_AUD_SRC_OPC_ERR;





int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,

static int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,

					      struct sram_channel *ch,

					      struct sram_channel *ch,

					      unsigned int bpl, u32 risc)

					      unsigned int bpl, u32 risc)

{

{
@@ -133,7 +133,7 @@ static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev, 
	return rp;

	return rp;

}

}





int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev,

static int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev,

				       struct pci_dev *pci,

				       struct pci_dev *pci,

				       unsigned int bpl, unsigned int lines)

				       unsigned int bpl, unsigned int lines)

{

{
@@ -197,7 +197,7 @@ int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev, 
	return 0;

	return 0;

}

}





void cx25821_free_memory_audio(struct cx25821_dev *dev)

static void cx25821_free_memory_audio(struct cx25821_dev *dev)

{

{

	if (dev->_risc_virt_addr) {

	if (dev->_risc_virt_addr) {

		pci_free_consistent(dev->pci, dev->_audiorisc_size,

		pci_free_consistent(dev->pci, dev->_audiorisc_size,
@@ -256,7 +256,7 @@ void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev) 
	cx25821_free_memory_audio(dev);

	cx25821_free_memory_audio(dev);

}

}





int cx25821_get_audio_data(struct cx25821_dev *dev,

static int cx25821_get_audio_data(struct cx25821_dev *dev,

			   struct sram_channel *sram_ch)

			   struct sram_channel *sram_ch)

{

{

	struct file *myfile;

	struct file *myfile;
@@ -351,7 +351,7 @@ static void cx25821_audioups_handler(struct work_struct *work) 
			sram_channels);

			sram_channels);

}

}





int cx25821_openfile_audio(struct cx25821_dev *dev,

static int cx25821_openfile_audio(struct cx25821_dev *dev,

			   struct sram_channel *sram_ch)

			   struct sram_channel *sram_ch)

{

{

	struct file *myfile;

	struct file *myfile;
@@ -490,7 +490,7 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev, 
	return ret;

	return ret;

}

}





int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,

static int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,

			       u32 status)

			       u32 status)

{

{

	int i = 0;

	int i = 0;
@@ -634,7 +634,7 @@ static void cx25821_wait_fifo_enable(struct cx25821_dev *dev, 




}

}





int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,

static int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,

					    struct sram_channel *sram_ch)

					    struct sram_channel *sram_ch)

{

{

	u32 tmp = 0;

	u32 tmp = 0;

drivers/media/pci/cx25821/cx25821-biffuncs.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -25,17 +25,17 @@ 




#define SetBit(Bit)  (1 << Bit)

#define SetBit(Bit)  (1 << Bit)





inline u8 getBit(u32 sample, u8 index)

static inline u8 getBit(u32 sample, u8 index)

{

{

	return (u8) ((sample >> index) & 1);

	return (u8) ((sample >> index) & 1);

}

}





inline u32 clearBitAtPos(u32 value, u8 bit)

static inline u32 clearBitAtPos(u32 value, u8 bit)

{

{

	return value & ~(1 << bit);

	return value & ~(1 << bit);

}

}





inline u32 setBitAtPos(u32 sample, u8 bit)

static inline u32 setBitAtPos(u32 sample, u8 bit)

{

{

	sample |= (1 << bit);

	sample |= (1 << bit);

	return sample;

	return sample;

drivers/media/pci/cx25821/cx25821-i2c.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -329,7 +329,8 @@ int cx25821_i2c_unregister(struct cx25821_i2c *bus) 
	return 0;

	return 0;

}

}





void cx25821_av_clk(struct cx25821_dev *dev, int enable)

#if 0 /* Currently unused */

static void cx25821_av_clk(struct cx25821_dev *dev, int enable)

{

{

	/* write 0 to bus 2 addr 0x144 via i2x_xfer() */

	/* write 0 to bus 2 addr 0x144 via i2x_xfer() */

	char buffer[3];

	char buffer[3];
@@ -351,6 +352,7 @@ void cx25821_av_clk(struct cx25821_dev *dev, int enable) 




	i2c_xfer(&dev->i2c_bus[0].i2c_adap, &msg, 1);

	i2c_xfer(&dev->i2c_bus[0].i2c_adap, &msg, 1);

}

}

#endif





int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value)

int cx25821_i2c_read(struct cx25821_i2c *bus, u16 reg_addr, int *value)

{

{

drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c

+14 −10
Original line number Original line Diff line number Diff line
@@ -123,9 +123,10 @@ static __le32 *cx25821_risc_field_upstream_ch2(struct cx25821_dev *dev, 
	return rp;

	return rp;

}

}





int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,

static int cx25821_risc_buffer_upstream_ch2(struct cx25821_dev *dev,

					    struct pci_dev *pci,

					    struct pci_dev *pci,

				     unsigned int top_offset, unsigned int bpl,

					    unsigned int top_offset,

					    unsigned int bpl,

					    unsigned int lines)

					    unsigned int lines)

{

{

	__le32 *rp;

	__le32 *rp;
@@ -255,7 +256,8 @@ void cx25821_free_mem_upstream_ch2(struct cx25821_dev *dev) 
	}

	}

}

}





int cx25821_get_frame_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)

static int cx25821_get_frame_ch2(struct cx25821_dev *dev,

				 struct sram_channel *sram_ch)

{

{

	struct file *myfile;

	struct file *myfile;

	int frame_index_temp = dev->_frame_index_ch2;

	int frame_index_temp = dev->_frame_index_ch2;
@@ -360,7 +362,8 @@ static void cx25821_vidups_handler_ch2(struct work_struct *work) 
			_channel2_upstream_select].sram_channels);

			_channel2_upstream_select].sram_channels);

}

}





int cx25821_openfile_ch2(struct cx25821_dev *dev, struct sram_channel *sram_ch)

static int cx25821_openfile_ch2(struct cx25821_dev *dev,

				struct sram_channel *sram_ch)

{

{

	struct file *myfile;

	struct file *myfile;

	int i = 0, j = 0;

	int i = 0, j = 0;
@@ -507,7 +510,8 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev, 
	return ret;

	return ret;

}

}





int cx25821_video_upstream_irq_ch2(struct cx25821_dev *dev, int chan_num,

static int cx25821_video_upstream_irq_ch2(struct cx25821_dev *dev,

					  int chan_num,

					  u32 status)

					  u32 status)

{

{

	u32 int_msk_tmp;

	u32 int_msk_tmp;
@@ -647,7 +651,7 @@ static void cx25821_set_pixelengine_ch2(struct cx25821_dev *dev, 
	cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);

	cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);

}

}





int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,

static int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,

						struct sram_channel *sram_ch)

						struct sram_channel *sram_ch)

{

{

	u32 tmp = 0;

	u32 tmp = 0;

drivers/media/pci/cx25821/cx25821-video-upstream.c

+18 −14
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_dev *dev, __le32 * rp, 
	return rp;

	return rp;

}

}





int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,

static int cx25821_risc_buffer_upstream(struct cx25821_dev *dev,

					struct pci_dev *pci,

					struct pci_dev *pci,

					unsigned int top_offset,

					unsigned int top_offset,

					unsigned int bpl, unsigned int lines)

					unsigned int bpl, unsigned int lines)
@@ -300,7 +300,8 @@ void cx25821_free_mem_upstream_ch1(struct cx25821_dev *dev) 
	}

	}

}

}





int cx25821_get_frame(struct cx25821_dev *dev, struct sram_channel *sram_ch)

static int cx25821_get_frame(struct cx25821_dev *dev,

			     struct sram_channel *sram_ch)

{

{

	struct file *myfile;

	struct file *myfile;

	int frame_index_temp = dev->_frame_index;

	int frame_index_temp = dev->_frame_index;
@@ -405,7 +406,8 @@ static void cx25821_vidups_handler(struct work_struct *work) 
			sram_channels);

			sram_channels);

}

}





int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch)

static int cx25821_openfile(struct cx25821_dev *dev,

			    struct sram_channel *sram_ch)

{

{

	struct file *myfile;

	struct file *myfile;

	int i = 0, j = 0;

	int i = 0, j = 0;
@@ -486,8 +488,9 @@ int cx25821_openfile(struct cx25821_dev *dev, struct sram_channel *sram_ch) 
	return 0;

	return 0;

}

}





int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,

static int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev,

				    struct sram_channel *sram_ch, int bpl)

					   struct sram_channel *sram_ch,

					   int bpl)

{

{

	int ret = 0;

	int ret = 0;

	dma_addr_t dma_addr;

	dma_addr_t dma_addr;
@@ -548,7 +551,7 @@ int cx25821_upstream_buffer_prepare(struct cx25821_dev *dev, 
	return ret;

	return ret;

}

}





int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,

static int cx25821_video_upstream_irq(struct cx25821_dev *dev, int chan_num,

				      u32 status)

				      u32 status)

{

{

	u32 int_msk_tmp;

	u32 int_msk_tmp;
@@ -664,7 +667,8 @@ static irqreturn_t cx25821_upstream_irq(int irq, void *dev_id) 
	return IRQ_RETVAL(handled);

	return IRQ_RETVAL(handled);

}

}





void cx25821_set_pixelengine(struct cx25821_dev *dev, struct sram_channel *ch,

static void cx25821_set_pixelengine(struct cx25821_dev *dev,

				    struct sram_channel *ch,

				    int pix_format)

				    int pix_format)

{

{

	int width = WIDTH_D1;

	int width = WIDTH_D1;
@@ -696,7 +700,7 @@ void cx25821_set_pixelengine(struct cx25821_dev *dev, struct sram_channel *ch, 
	cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);

	cx_write(ch->vid_cdt_size, VID_CDT_SIZE >> 3);

}

}





int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,

static int cx25821_start_video_dma_upstream(struct cx25821_dev *dev,

					    struct sram_channel *sram_ch)

					    struct sram_channel *sram_ch)

{

{

	u32 tmp = 0;

	u32 tmp = 0;