Skip to contentSkip to conversation

tm6000 compilation breakage on linux-next

PATCH Mauro Carvalho Chehab 3 participants 4 messages May 3, 2010

Subsystems (2)
Staging Linux-next tree
lore
Share & tools
lore

Mauro Carvalho Chehab

author
#0 lore raw

Hi Stephen,

Randy reported a breakage while compiling drivers/staging/tm6000, due to this change:
commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c
Author: Greg Kroah-Hartman <[email protected]>
Date: Thu Apr 29 15:46:07 2010 -0700

USB: remove unused usb_buffer_alloc and usb_buffer_free macros

Now that all callers are converted over, remove the compatibility functions and all is good.

Cc Daniel Mack <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>

A fix patch is as simple as:
s/usb_buffer_alloc/usb_alloc_coherent/
s/usb_buffer_free/usb_free_coherent/

The problem is that, if I apply such patch on my tree, it will break compilation with upstream. So, the better is if you could handle it until the next merge window. After Greg's merge, I'll apply it on my tree, and submit tm6000 driver to staging.

Would this be ok for you, or do you have a better approach for such kind of conflicts?

Signature · 20 lines
Fix compilation breakage with tm6000
    
Randy Dunlap <[email protected]>  reported a breakage while compiling
drivers/staging/tm6000, due to this change:
    commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c
    Author: Greg Kroah-Hartman <[email protected]>
    Date:   Thu Apr 29 15:46:07 2010 -0700

    USB: remove unused usb_buffer_alloc and usb_buffer_free macros

    Now that all callers are converted over, remove the compatibility
    functions and all is good.

    Cc: Daniel Mack <[email protected]>
    Signed-off-by: Greg Kroah-Hartman <[email protected]>
    
As the function got renamed, the rename should also be applied at
tm6000 on linux-next.
    
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
drivers/staging/tm6000/tm6000-video.c +2 -2
index 9554472..da1dc07 100644
@@ -585,7 +585,7 @@ static void tm6000_uninit_isoc(struct tm6000_core *dev)
 			usb_kill_urb(urb);
 			usb_unlink_urb(urb);
 			if (dev->isoc_ctl.transfer_buffer[i]) {
-				usb_buffer_free(dev->udev,
+				usb_free_coherent(dev->udev,
 						urb->transfer_buffer_length,
 						dev->isoc_ctl.transfer_buffer[i],
 						urb->transfer_dma);

@@ -672,7 +672,7 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev, unsigned int framesize)
 		}
 		dev->isoc_ctl.urb[i] = urb;
 
-		dev->isoc_ctl.transfer_buffer[i] = usb_buffer_alloc(dev->udev,
+		dev->isoc_ctl.transfer_buffer[i] = usb_alloc_coherent(dev->udev,
 			sb_size, GFP_KERNEL, &urb->transfer_dma);
 		if (!dev->isoc_ctl.transfer_buffer[i]) {
 			tm6000_err ("unable to allocate %i bytes for transfer"

Cheers,
Mauro

#1 lore raw
Quoted 16 lines · Mauro Carvalho Chehab

Hi Stephen,

Randy reported a breakage while compiling drivers/staging/tm6000, due to this change:
commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c
Author: Greg Kroah-Hartman <[email protected]>
Date: Thu Apr 29 15:46:07 2010 -0700

USB: remove unused usb_buffer_alloc and usb_buffer_free macros

Now that all callers are converted over, remove the compatibility functions and all is good.

Cc Daniel Mack <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 6 lines

A fix patch is as simple as:
s/usb_buffer_alloc/usb_alloc_coherent/
s/usb_buffer_free/usb_free_coherent/

The problem is that, if I apply such patch on my tree, it will break compilation with upstream.

Not anymore. Those functions are now in Linus's tree, so you can safely make the change in your tree now, and all is good :)

thanks,

greg k-h

author
#2 lore raw
Quoted 21 lines · Greg KH
Quoted 20 lines · Mauro Carvalho Chehab

Hi Stephen,

Randy reported a breakage while compiling drivers/staging/tm6000, due to this change:
commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c
Author: Greg Kroah-Hartman <[email protected]>
Date: Thu Apr 29 15:46:07 2010 -0700

USB: remove unused usb_buffer_alloc and usb_buffer_free macros

Now that all callers are converted over, remove the compatibility functions and all is good.

Cc Daniel Mack <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>

A fix patch is as simple as:
s/usb_buffer_alloc/usb_alloc_coherent/
s/usb_buffer_free/usb_free_coherent/

Quoted 5 lines
Quoted 2 lines

The problem is that, if I apply such patch on my tree, it will break compilation with upstream.

Not anymore. Those functions are now in Linus's tree, so you can safely make the change in your tree now, and all is good :)

Ah, that makes life easier, thanks!

Signature · 2 lines
Cheers,
Mauro
Acked-by
#3 lore raw
In reply to Mauro Carvalho Chehab
Quoted 13 lines · Mauro Carvalho Chehab

Hi Stephen,

Randy reported a breakage while compiling drivers/staging/tm6000, due to this change:
commit 1c1b78bee1a94f98deeb9c24b21c4812e191646c
Author: Greg Kroah-Hartman <[email protected]>
Date: Thu Apr 29 15:46:07 2010 -0700

USB: remove unused usb_buffer_alloc and usb_buffer_free macros

Now that all callers are converted over, remove the compatibility functions and all is good.

Quoted 6 lines
Cc Daniel Mack <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>

A fix patch is as simple as:
s/usb_buffer_alloc/usb_alloc_coherent/
s/usb_buffer_free/usb_free_coherent/

Patch:

Acked-by Randy Dunlap <[email protected]>

Thanks.

Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***