From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Patrick Boettcher <pboettcher@kernellabs.com>,
Martin Wilks <m.wilks@technisat.com>
Subject: Re: linux-next: build failure after merge of the v4l-dvb tree
Date: Mon, 22 Nov 2010 10:08:45 -0200 [thread overview]
Message-ID: <4CEA5D4D.3050107@infradead.org> (raw)
In-Reply-To: <20101122114315.687b4bd5.sfr@canb.auug.org.au>
Em 21-11-2010 22:43, Stephen Rothwell escreveu:
> Hi Mauro,
>
> On Mon, 15 Nov 2010 10:25:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the v4l-dvb tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/media/dvb/dvb-usb/technisat-usb2.c: In function 'technisat_usb2_get_ir':
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:643: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:649: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:654: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
>> drivers/media/dvb/dvb-usb/technisat-usb2.c: At top level:
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: error: unknown field 'rc_props' specified in initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: braces around scalar initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: field name not in record or union initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: field name not in record or union initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: excess elements in scalar initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> make[5]: *** No rule to make target `drivers/media/rc/keymaps/rc-technisat-usb2.c', needed by `drivers/media/rc/keymaps/rc-technisat-usb2.o'. Stop.
>>
>> Caused by commit f29235d71ad3995ef9f74ad2f5931eca4ecabdcd ("[media]
>> technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver")
>> interacting with commit 1639cc0c5348957c076c0304005632d4a1b63252
>> ("[media] ir-core: make struct rc_dev the primary interface").
>>
>> Please make sure your build tests build new/modified files.
>>
>> I have used the v4l-dvb tree from next-20101112 for today.
>
> This is still failing ...
Hi Stephen,
It is a simple merge confict between two of my trees that got merged on my linux-next.
The enclosed patch should fix it. I've already added it to my linux-next tree, so
the conflict should be fixed for tomorrow's build.
Mauro.
>From f80587fdbf8c949d2081aa0e4250d21c09058877 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 22 Nov 2010 10:04:45 -0200
Subject: [PATCH] [media] linux-next: Fix technisat-usb2 compilation
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index bbba149..458fa27 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -246,7 +246,7 @@ static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d)
dev->map_name = d->props.rc.core.rc_codes;
dev->change_protocol = d->props.rc.core.change_protocol;
dev->allowed_protos = d->props.rc.core.allowed_protos;
- dev->driver_type = RC_DRIVER_SCANCODE;
+ dev->driver_type = d->props.rc.core.driver_type;
usb_to_input_id(d->udev, &dev->input_id);
dev->input_name = "IR-receiver inside an USB DVB receiver";
dev->input_phys = d->rc_phys;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 83aa982..e818f0c 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -195,6 +195,7 @@ struct dvb_rc {
int (*rc_query) (struct dvb_usb_device *d);
int rc_interval;
bool bulk_mode; /* uses bulk mode */
+ enum rc_driver_type driver_type;
};
/**
diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c
index 97a6d45..b0e35e9 100644
--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c
@@ -640,18 +640,18 @@ unlock:
while (1) {
ev.pulse = !ev.pulse;
ev.duration = (*b * FIRMWARE_CLOCK_DIVISOR * FIRMWARE_CLOCK_TICK) / 1000;
- ir_raw_event_store(d->rc_input_dev, &ev);
+ ir_raw_event_store(d->rc_dev, &ev);
b++;
if (*b == 0xff) {
ev.pulse = 0;
ev.duration = 888888*2;
- ir_raw_event_store(d->rc_input_dev, &ev);
+ ir_raw_event_store(d->rc_dev, &ev);
break;
}
}
- ir_raw_event_handle(d->rc_input_dev);
+ ir_raw_event_handle(d->rc_dev);
return 1;
}
@@ -729,10 +729,8 @@ static struct dvb_usb_device_properties technisat_usb2_devices = {
.rc_codes = RC_MAP_TECHNISAT_USB2,
.module_name = "technisat-usb2",
.rc_query = technisat_usb2_rc_query,
- .rc_props = {
- .allowed_protos = IR_TYPE_ALL,
- .driver_type = RC_DRIVER_IR_RAW,
- },
+ .allowed_protos = IR_TYPE_ALL,
+ .driver_type = RC_DRIVER_IR_RAW,
}
};
diff --git a/drivers/media/IR/keymaps/rc-technisat-usb2.c b/drivers/media/rc/keymaps/rc-technisat-usb2.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-technisat-usb2.c
rename to drivers/media/rc/keymaps/rc-technisat-usb2.c
next prev parent reply other threads:[~2010-11-22 12:08 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-14 23:25 linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell
2010-11-22 0:43 ` Stephen Rothwell
2010-11-22 12:08 ` Mauro Carvalho Chehab [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-02-10 1:46 Stephen Rothwell
2020-09-14 6:24 Stephen Rothwell
2020-09-08 2:11 Stephen Rothwell
2020-04-22 0:41 Stephen Rothwell
2020-04-16 8:27 Stephen Rothwell
2020-03-13 2:19 Stephen Rothwell
2020-03-13 6:48 ` Marco Felsch
2020-03-13 7:05 ` Mauro Carvalho Chehab
2020-03-13 7:14 ` Marco Felsch
2020-03-13 7:07 ` Mauro Carvalho Chehab
2020-03-13 10:29 ` Stephen Rothwell
2020-03-16 6:50 ` Mauro Carvalho Chehab
2019-07-23 0:13 Stephen Rothwell
2019-07-23 15:14 ` Ezequiel Garcia
2019-07-23 15:52 ` Mauro Carvalho Chehab
2019-02-18 23:52 Stephen Rothwell
2018-07-27 1:49 Stephen Rothwell
2017-06-21 1:25 Stephen Rothwell
2017-06-21 8:54 ` Stanimir Varbanov
2017-01-31 0:55 Stephen Rothwell
2017-02-02 22:24 ` Stephen Rothwell
2017-02-02 22:46 ` Mauro Carvalho Chehab
2017-02-02 22:59 ` Stephen Rothwell
2017-02-02 23:24 ` Mauro Carvalho Chehab
2017-02-03 0:01 ` Stephen Rothwell
2017-02-03 0:24 ` Mauro Carvalho Chehab
2017-02-05 22:19 ` Stephen Rothwell
2017-02-05 22:22 ` Mauro Carvalho Chehab
2016-09-12 5:10 Stephen Rothwell
2016-09-12 6:33 ` Hans Verkuil
2015-08-12 3:24 Stephen Rothwell
2015-06-19 4:47 Michael Ellerman
2015-04-10 10:11 Stephen Rothwell
2015-04-10 12:45 ` Laurent Pinchart
2015-04-10 12:57 ` Stephen Rothwell
2015-04-13 3:05 ` Stephen Rothwell
2015-04-13 8:02 ` Laurent Pinchart
2014-09-09 2:43 Stephen Rothwell
2014-09-09 3:05 ` Mauro Carvalho Chehab
2014-09-17 3:47 ` Stephen Rothwell
2014-07-25 2:23 Stephen Rothwell
[not found] ` <9f4bd671-cbe0-4e11-997e-e369c52589f9@email.android.com>
2014-07-25 21:50 ` Mauro Carvalho Chehab
2014-07-15 3:29 Stephen Rothwell
2014-07-15 5:43 ` Guenter Roeck
2014-07-15 5:55 ` Stephen Rothwell
2014-07-15 9:01 ` Guenter Roeck
2014-07-15 18:08 ` Mauro Carvalho Chehab
2014-07-15 19:08 ` Guenter Roeck
2014-07-16 3:04 ` Stephen Rothwell
2014-07-16 4:29 ` Guenter Roeck
2014-07-16 13:21 ` Ingo Molnar
2014-07-16 13:22 ` Stephen Rothwell
2014-07-16 13:24 ` Ingo Molnar
2014-03-31 2:01 Stephen Rothwell
2014-03-31 10:26 ` Mauro Carvalho Chehab
2013-01-11 0:39 Stephen Rothwell
2013-01-11 15:12 ` Mauro Carvalho Chehab
2012-11-26 2:31 Stephen Rothwell
2012-11-26 12:10 ` Mauro Carvalho Chehab
2012-11-26 13:44 ` Marek Szyprowski
2012-11-12 0:09 Stephen Rothwell
2012-11-13 13:14 ` Mauro Carvalho Chehab
2012-11-07 0:05 Stephen Rothwell
2012-11-07 1:12 ` Mauro Carvalho Chehab
2012-10-29 0:14 Stephen Rothwell
2012-10-29 8:09 ` David Härdeman
2012-10-29 8:43 ` Jiri Kosina
2012-10-29 9:52 ` Mauro Carvalho Chehab
2012-11-05 0:34 ` Stephen Rothwell
2012-11-06 1:26 ` Mauro Carvalho Chehab
2012-08-17 1:10 Stephen Rothwell
2012-08-17 1:46 ` Mauro Carvalho Chehab
2012-07-09 1:50 Stephen Rothwell
2012-04-11 2:10 Stephen Rothwell
2012-04-11 7:32 ` Srinivas KANDAGATLA
2012-04-17 3:25 ` Stephen Rothwell
2011-09-26 4:02 Stephen Rothwell
2011-09-22 3:12 Stephen Rothwell
2011-09-22 12:46 ` Mauro Carvalho Chehab
2011-09-22 20:19 ` Greg KH
2011-09-23 14:27 ` Mauro Carvalho Chehab
2011-09-27 0:49 ` Greg KH
2011-07-04 3:08 Stephen Rothwell
2011-07-04 3:04 Stephen Rothwell
2011-07-05 12:43 ` Jonathan Corbet
2011-03-22 1:14 Stephen Rothwell
2011-03-22 7:54 ` Mauro Carvalho Chehab
2011-02-28 1:05 Stephen Rothwell
2011-02-28 7:28 ` Hans Verkuil
2011-03-01 11:21 ` Mauro Carvalho Chehab
2011-03-03 1:37 ` Stephen Rothwell
2010-10-01 1:41 Stephen Rothwell
2010-09-29 1:29 Stephen Rothwell
2010-09-29 1:40 ` Mauro Carvalho Chehab
2010-09-30 3:44 ` Mauro Carvalho Chehab
2010-05-20 1:45 Stephen Rothwell
2010-05-20 1:51 ` Mauro Carvalho Chehab
2010-04-12 2:40 Stephen Rothwell
2010-04-28 1:07 ` Stephen Rothwell
2010-05-03 5:01 ` Stephen Rothwell
2010-05-03 7:58 ` Mauro Carvalho Chehab
2010-05-03 10:25 ` Stephen Rothwell
2010-02-05 5:52 Stephen Rothwell
2010-02-05 15:02 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CEA5D4D.3050107@infradead.org \
--to=mchehab@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.wilks@technisat.com \
--cc=pboettcher@kernellabs.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).