dvb-usb-v2 change broke s2250-loader compilation

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Em 16-08-2012 15:48, Antti Palosaari escreveu:
> On 08/16/2012 09:34 PM, Mauro Carvalho Chehab wrote:
>> Em 16-08-2012 15:31, Antti Palosaari escreveu:
>>> On 08/16/2012 07:50 PM, Mauro Carvalho Chehab wrote:
>>>> Em 16-08-2012 11:29, Antti Palosaari escreveu:
>>>>> On 08/16/2012 05:07 PM, Hans Verkuil wrote:
>>>>>> On Thu August 16 2012 15:45:47 Antti Palosaari wrote:
>>>>>>> On 08/16/2012 03:18 PM, Antti Palosaari wrote:
>>>>>>>> On 08/16/2012 01:33 PM, Hans Verkuil wrote:
>>>>>>>>> Building the kernel with the Sensoray 2250/2251 staging go7007 driver
>>>>>>>>> enabled
>>>>>>>>> fails with this link error:
>>>>>>>>>
>>>>>>>>> ERROR: "usb_cypress_load_firmware"
>>>>>>>>> [drivers/staging/media/go7007/s2250-loader.ko] undefined!
>>>>>>>>>
>>>>>>>>> As far as I can tell this is related to the dvb-usb-v2 changes.
>>>>>>>>>
>>>>>>>>> Can someone take a look at this?
>>>>>>>>>
>>>>>>>>> Thanks!
>>>>>>>>>
>>>>>>>>>        Hans
>>>>>>>>
>>>>>>>> Yes it is dvb usb v2 related. I wasn't even aware that someone took that
>>>>>>>> module use in few days after it was added for the dvb-usb-v2.
>>>>>>>>
>>>>>>>> Maybe it is worth to make it even more common and move out of dvb-usb-v2...
>>>>>>>>
>>>>>>>> regards
>>>>>>>> Antti
>>>>>>>
>>>>>>> And after looking it twice I cannot see the reason. I split that Cypress
>>>>>>> firmware download to own module called dvb_usb_cypress_firmware which
>>>>>>> offer routine usbv2_cypress_load_firmware(). Old DVB USB is left
>>>>>>> untouched. I can confirm it fails to compile for s2250, but there is
>>>>>>> still old dvb_usb_cxusb that is compiling without a error.
>>>>>>>
>>>>>>> Makefile paths seems to be correct also, no idea whats wrong....
>>>>>>
>>>>>> drivers/media/usb/Makefile uses := instead of += for the dvb-usb(-v2) directories,
>>>>>> and that prevents dvb-usb from being build. I think that's the cause of the link
>>>>>> error.
>>>>>
>>>>> For that I cannot say as I don't understand situation enough.
>>>>>
>>>>>> In addition I noticed that in usb/dvb-usb there is a dvb_usb_dvb.c and a
>>>>>> dvb-usb-dvb.c file: there's a mixup with _ and -.
>>>>>
>>>>> These files seems to be my fault. Original patch series removes those,
>>>>> but I was forced to rebase whole set and in that rebased set those are left unremoved.
>>>>> Likely due to some rebase conflict. I will send new patch to remove those.
>>>>
>>>> If you remove the _, they'll conflict with dvb-usb at media-build.git.
>>>>
>>>> The better is to add a _v2 (or -v2) on all dvb-usb-v2 files
>>>> (or to convert the remaining dvb-usb drivers to dvb-usb-v2).
>>>
>>> hmm, now I am quite out what you mean.
>>>
>>> This is from my first PULL-request:
>>> http://git.linuxtv.org/anttip/media_tree.git/commit/c60c6d44111be2b2fd9ef9b716ea50bd87493893
>>>
>>> And this is same patch after large rebase:
>>> http://git.linuxtv.org/anttip/media_tree.git/commit/ac97c6f722aafb5b562ef04062b543147399dff8
>>>
>>> Why removing those wrong files will cause conflict in media_build.git ?
>>
>> Because, at the media-build, all files are linked into the "/v4l" dir. If there are two different
>> modules with the same name, one will override the other.
> 
> But there should not be same names what I know.
> Here is the list of DVB USB related files:
> 
> DVB USB v1:
> ***********
> dvb-usb/dvb-usb-firmware.c
> dvb-usb/dvb-usb.h
> dvb-usb/dvb-usb-common.h
> dvb-usb/dvb_usb_dvb.c *** not needed
> dvb-usb/dvb-usb-dvb.c
> dvb-usb/dvb-usb-i2c.c
> dvb-usb/dvb-usb-init.c
> dvb-usb/dvb_usb_remote.c *** not needed
> dvb-usb/dvb-usb-remote.c
> dvb-usb/dvb-usb-urb.c
> dvb-usb/usb-urb.c
> dvb-usb/dvb-usb.ko
> 
> DVB USB v2:
> ***********
> dvb-usb-v2/cypress_firmware.c
> dvb-usb-v2/cypress_firmware.h
> dvb-usb-v2/dvb_usb.h
> dvb-usb-v2/dvb_usb_common.h
> dvb-usb-v2/dvb_usb_core.c
> dvb-usb-v2/dvb_usb_urb.c
> dvb-usb-v2/usb_urb.c
> dvb-usb-v2/dvb_usb_cypress_firmware.ko
> dvb-usb-v2/dvb_usbv2.ko

Yes, but Hans got confused with dvb_usb/dvb-usb stuff.
I said that renaming from one to the other would cause conflicts.

-

As discussed on IRC, this patch should likely fix it (untested, at media-build).

[media] Fix some Makefile rules

From: Mauro Carvalho Chehab <mchehab@redhat.com>

On a few places, := were using instead of +=, causing drivers to
not compile.

While here, standardize the usage of += on all cases where multiple
lines are needed, and for obj-y/obj-m targets, and := when just one
line is needed, on <module>-obj rules.

Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Identified-by: Antti Polosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

dvb-usb-v2 change broke s2250-loader compilation

Commit Message

Comments

Patch