[media] media: lirc_dev: merge struct irctl into struct lirc_dev

Browse source

The use of two separate structs (lirc_dev aka lirc_driver and irctl) makes
it much harder to follow the proper lifetime of the various structs and
necessitates hacks such as keeping a copy of struct lirc_dev inside
struct irctl.

Merging the two structs means that lirc_dev can properly manage the
lifetime of the resulting struct and simplifies the code at the same time.

[mchehab@s-opensource.com: fix merge conflict]
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

...

This commit is contained in:

David Härdeman 2017-06-25 09:32:36 -03:00 • committed by Mauro Carvalho Chehab

parent 13f96555d6

commit b15e39379f

4 changed files with 175 additions and 200 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

drivers/media/rc/ir-lirc-codec.c

View file

318

drivers/media/rc/lirc_dev.c

View file

20

drivers/staging/media/lirc/lirc_zilog.c

View file

26

include/media/lirc_dev.h

View file