aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-03 19:32:21 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-25 18:10:43 -0400
commitc5540fbb9de39ceec108a889133664a887c2f55a (patch)
tree92d1523fa4ab99fc27d14dcd3ee00627eeb8a346 /drivers/media/pci
parentda6e162d6a4607362f8478c715c797d84d449f8b (diff)
[media] rc-core: remove protocol arrays
The basic API of rc-core used to be: dev = rc_allocate_device(); dev->x = a; dev->y = b; dev->z = c; rc_register_device(); which is a pretty common pattern in the kernel, after the introduction of protocol arrays the API looks something like: dev = rc_allocate_device(); dev->x = a; rc_set_allowed_protocols(dev, RC_BIT_X); dev->z = c; rc_register_device(); There's no real need for the protocols to be an array, so change it back to be consistent (and in preparation for the following patches). [m.chehab@samsung.com: added missing changes at some files] Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/cx23885/cx23885-input.c2
-rw-r--r--drivers/media/pci/cx88/cx88-input.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 097d0a0b5f57..1940c18e186c 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -346,7 +346,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
346 } 346 }
347 rc->dev.parent = &dev->pci->dev; 347 rc->dev.parent = &dev->pci->dev;
348 rc->driver_type = driver_type; 348 rc->driver_type = driver_type;
349 rc_set_allowed_protocols(rc, allowed_protos); 349 rc->allowed_protocols = allowed_protos;
350 rc->priv = kernel_ir; 350 rc->priv = kernel_ir;
351 rc->open = cx23885_input_ir_open; 351 rc->open = cx23885_input_ir_open;
352 rc->close = cx23885_input_ir_close; 352 rc->close = cx23885_input_ir_close;
diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index 9bf48ca619c7..93ff6a7f2354 100644
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -485,7 +485,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
485 dev->timeout = 10 * 1000 * 1000; /* 10 ms */ 485 dev->timeout = 10 * 1000 * 1000; /* 10 ms */
486 } else { 486 } else {
487 dev->driver_type = RC_DRIVER_SCANCODE; 487 dev->driver_type = RC_DRIVER_SCANCODE;
488 rc_set_allowed_protocols(dev, rc_type); 488 dev->allowed_protocols = rc_type;
489 } 489 }
490 490
491 ir->core = core; 491 ir->core = core;