Skip to content

Commit

Permalink
[media] mantis: get rid of warning: no previous prototype
Browse files Browse the repository at this point in the history
drivers/media/pci/mantis/mantis_input.c:107:5: warning: no previous prototype for 'mantis_input_init' [-Wmissing-prototypes]
drivers/media/pci/mantis/mantis_input.c:153:5: warning: no previous prototype for 'mantis_exit' [-Wmissing-prototypes]
drivers/media/pci/mantis/mantis_uart.c:64:5: warning: no previous prototype for 'mantis_uart_read' [-Wmissing-prototypes]
drivers/media/pci/mantis/mantis_vp1033.c:118:5: warning: no previous prototype for 'lgtdqcs001f_set_symbol_rate' [-Wmissing-prototypes]
drivers/media/pci/mantis/mantis_vp1033.c:86:5: warning: no previous prototype for 'lgtdqcs001f_tuner_set' [-Wmissing-prototypes]

Note: there is already a mantis_exit at the mantis driver. So,
this should be renamed to mantis_input_exit.

The mantis_input code is currently unused, as it doesn't implement the RC API
right.

Patches for it are sent for discussions, but were never
accepted. So, while this is not fixed, the entire code inside
mantis_input can simply be commented.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Oct 27, 2012
1 parent d6eb0b9 commit 6860f9c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
5 changes: 4 additions & 1 deletion drivers/media/pci/mantis/mantis_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#if 0 /* Currently unused */

#include <media/rc-core.h>
#include <linux/pci.h>

Expand Down Expand Up @@ -150,10 +152,11 @@ int mantis_input_init(struct mantis_pci *mantis)
return err;
}

int mantis_exit(struct mantis_pci *mantis)
int mantis_init_exit(struct mantis_pci *mantis)
{
rc_unregister_device(mantis->rc);
rc_map_unregister(&ir_mantis_map);
return 0;
}

#endif
2 changes: 1 addition & 1 deletion drivers/media/pci/mantis/mantis_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ static struct {

#define UART_MAX_BUF 16

int mantis_uart_read(struct mantis_pci *mantis, u8 *data)
static int mantis_uart_read(struct mantis_pci *mantis, u8 *data)
{
struct mantis_hwconfig *config = mantis->hwconfig;
u32 stat = 0, i;
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/pci/mantis/mantis_vp1033.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ u8 lgtdqcs001f_inittab[] = {
#define MANTIS_MODEL_NAME "VP-1033"
#define MANTIS_DEV_TYPE "DVB-S/DSS"

int lgtdqcs001f_tuner_set(struct dvb_frontend *fe)
static int lgtdqcs001f_tuner_set(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct mantis_pci *mantis = fe->dvb->priv;
Expand Down Expand Up @@ -115,8 +115,8 @@ int lgtdqcs001f_tuner_set(struct dvb_frontend *fe)
return 0;
}

int lgtdqcs001f_set_symbol_rate(struct dvb_frontend *fe,
u32 srate, u32 ratio)
static int lgtdqcs001f_set_symbol_rate(struct dvb_frontend *fe,
u32 srate, u32 ratio)
{
u8 aclk = 0;
u8 bclk = 0;
Expand Down

0 comments on commit 6860f9c

Please sign in to comment.