From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 17 Dec 2009 01:57:27 +0000 (-0200)
Subject: V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c0832e3990b541ea1b8f5d44fe4c204a5e7d396;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions

Fix a merge conflict between mantis and IR cleanups

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

diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index 487d149c802..6a9df779441 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -118,7 +118,7 @@ int mantis_input_init(struct mantis_pci *mantis)
 	rc->name = name;
 	rc->phys = dev;
 
-	ir_input_init(rc, &rc_state, IR_TYPE_OTHER, &ir_mantis);
+	ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
 
 	rc->id.bustype	= BUS_PCI;
 	rc->id.vendor	= mantis->vendor_id;
@@ -126,7 +126,7 @@ int mantis_input_init(struct mantis_pci *mantis)
 	rc->id.version	= 1;
 	rc->dev		= mantis->pdev->dev;
 
-	err = input_register_device(rc);
+	err = ir_input_register(rc, &ir_mantis);
 	if (err) {
 		dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
 		input_free_device(rc);
@@ -142,7 +142,7 @@ int mantis_exit(struct mantis_pci *mantis)
 {
 	struct input_dev *rc = mantis->rc;
 
-	input_unregister_device(rc);
+	ir_input_unregister(rc);
 
 	return 0;
 }