mirror of https://gitee.com/openkylin/linux.git
V4L/DVB: ir-core: convert mantis to not use ir-functions.c
Convert drivers/media/dvb/mantis/mantis_input.c to not use ir-functions.c Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
bee30192fe
commit
f0bdee26a2
|
@ -19,7 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <media/ir-common.h>
|
#include <media/ir-core.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
|
|
||||||
#include "dmxdev.h"
|
#include "dmxdev.h"
|
||||||
|
@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(ir_mantis);
|
||||||
int mantis_input_init(struct mantis_pci *mantis)
|
int mantis_input_init(struct mantis_pci *mantis)
|
||||||
{
|
{
|
||||||
struct input_dev *rc;
|
struct input_dev *rc;
|
||||||
struct ir_input_state rc_state;
|
|
||||||
char name[80], dev[80];
|
char name[80], dev[80];
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -120,8 +119,6 @@ int mantis_input_init(struct mantis_pci *mantis)
|
||||||
rc->name = name;
|
rc->name = name;
|
||||||
rc->phys = dev;
|
rc->phys = dev;
|
||||||
|
|
||||||
ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
|
|
||||||
|
|
||||||
rc->id.bustype = BUS_PCI;
|
rc->id.bustype = BUS_PCI;
|
||||||
rc->id.vendor = mantis->vendor_id;
|
rc->id.vendor = mantis->vendor_id;
|
||||||
rc->id.product = mantis->device_id;
|
rc->id.product = mantis->device_id;
|
||||||
|
|
Loading…
Reference in New Issue