linux-next: manual merge of the usb tree with the input tree

linux-next: manual merge of the usb tree with the input tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/acecad.c between commits
2ef2ed597669f5e120d0c51c295f00e34b2f0801 ("Input: acecad - fix incorrect
size parameter in usb_buffer_free") and
5492f6f801c81c9663417cd8e48e759775977c83 ("Input: acecad - simplify
usb_acecad_disconnect()") from the input tree and commit
3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
and usb_buffer_free() users") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/tablet/acecad.c
index 37d0539,c047016..0000000
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@@ -246,11 -252,13 +246,11 @@@ static void usb_acecad_disconnect(struc
  	struct usb_acecad *acecad = usb_get_intfdata(intf);
  
  	usb_set_intfdata(intf, NULL);
 -	if (acecad) {
 -		usb_kill_urb(acecad->irq);
 -		input_unregister_device(acecad->input);
 -		usb_free_urb(acecad->irq);
 -		usb_free_coherent(interface_to_usbdev(intf), 10, acecad->data, acecad->data_dma);
 -		kfree(acecad);
 -	}
 +
 +	input_unregister_device(acecad->input);
 +	usb_free_urb(acecad->irq);
- 	usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma);
++	usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma);
 +	kfree(acecad);
  }
  
  static struct usb_device_id usb_acecad_id_table [] = {

linux-next: manual merge of the usb tree with the input tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/kbtab.c between commits
ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418 ("Input: kbtab - fix incorrect
size parameter in usb_buffer_free") and
331cb022d3ac1f85f7842a51495c33c629e947bc ("Input: kbtab - simplify
kbtab_disconnect()") from the input tree and commit
3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
and usb_buffer_free() users") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/tablet/kbtab.c
index b9969f1,d31b9c7..0000000
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@@ -173,7 -182,7 +173,7 @@@ static int kbtab_probe(struct usb_inter
  	return 0;
  
   fail3:	usb_free_urb(kbtab->irq);
-  fail2:	usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
 - fail2:	usb_free_coherent(dev, 10, kbtab->data, kbtab->data_dma);
++ fail2:	usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma);
   fail1:	input_free_device(input_dev);
  	kfree(kbtab);
  	return error;
@@@ -184,11 -193,13 +184,11 @@@ static void kbtab_disconnect(struct usb
  	struct kbtab *kbtab = usb_get_intfdata(intf);
  
  	usb_set_intfdata(intf, NULL);
 -	if (kbtab) {
 -		usb_kill_urb(kbtab->irq);
 -		input_unregister_device(kbtab->dev);
 -		usb_free_urb(kbtab->irq);
 -		usb_free_coherent(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);
 -		kfree(kbtab);
 -	}
 +
 +	input_unregister_device(kbtab->dev);
 +	usb_free_urb(kbtab->irq);
- 	usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
++	usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
 +	kfree(kbtab);
  }
  
  static struct usb_driver kbtab_driver = {

linux-next: manual merge of the usb tree with the input tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/wacom_sys.c between commits
4492efffffeb88d87e7aa74765f3c53b3a7dd40f ("Input: wacom - share pen info
with touch of the same ID") and 51269fe86c263ec4fafbafe82970e6d7f6f79102
("Input: wacom - do not allocate wacom_wac separately") from the input
tree and commit 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename
usb_buffer_alloc() and usb_buffer_free() users") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/tablet/wacom_sys.c
index d90f4e0,191197c..0000000
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@@ -534,11 -632,11 +534,11 @@@ static int wacom_probe(struct usb_inter
  	usb_set_intfdata(intf, wacom);
  	return 0;
  
 + fail4:	wacom_remove_shared_data(wacom_wac);
   fail3:	usb_free_urb(wacom->irq);
-  fail2:	usb_buffer_free(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
+  fail2:	usb_free_coherent(dev, WACOM_PKGLEN_MAX, wacom_wac->data, wacom->data_dma);
   fail1:	input_free_device(input_dev);
  	kfree(wacom);
 -	kfree(wacom_wac);
  	return error;
  }
  
@@@ -549,11 -647,11 +549,11 @@@ static void wacom_disconnect(struct usb
  	usb_set_intfdata(intf, NULL);
  
  	usb_kill_urb(wacom->irq);
 -	input_unregister_device(wacom->dev);
 +	input_unregister_device(wacom->wacom_wac.input);
  	usb_free_urb(wacom->irq);
- 	usb_buffer_free(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
+ 	usb_free_coherent(interface_to_usbdev(intf), WACOM_PKGLEN_MAX,
 -			  wacom->wacom_wac->data, wacom->data_dma);
 -	kfree(wacom->wacom_wac);
 +			wacom->wacom_wac.data, wacom->data_dma);
 +	wacom_remove_shared_data(&wacom->wacom_wac);
  	kfree(wacom);
  }
  

Re: linux-next: manual merge of the usb tree with the input tree

[Greg KH]

On Fri, Apr 30, 2010 at 03:51:22PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/wacom_sys.c between commits
> 4492efffffeb88d87e7aa74765f3c53b3a7dd40f ("Input: wacom - share pen info
> with touch of the same ID") and 51269fe86c263ec4fafbafe82970e6d7f6f79102
> ("Input: wacom - do not allocate wacom_wac separately") from the input
> tree and commit 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename
> usb_buffer_alloc() and usb_buffer_free() users") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, I think you will have to until things get merged.

greg k-h

Re: linux-next: manual merge of the usb tree with the input tree

[Greg KH]

On Fri, Apr 30, 2010 at 03:51:15PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/kbtab.c between commits
> ee7aa6ce41e08c68f72b5ca8f14fb61286dc2418 ("Input: kbtab - fix incorrect
> size parameter in usb_buffer_free") and
> 331cb022d3ac1f85f7842a51495c33c629e947bc ("Input: kbtab - simplify
> kbtab_disconnect()") from the input tree and commit
> 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
> and usb_buffer_free() users") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

thanks for the fix.

greg k-h

Re: linux-next: manual merge of the usb tree with the input tree

[Greg KH]

On Fri, Apr 30, 2010 at 03:51:08PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/acecad.c between commits
> 2ef2ed597669f5e120d0c51c295f00e34b2f0801 ("Input: acecad - fix incorrect
> size parameter in usb_buffer_free") and
> 5492f6f801c81c9663417cd8e48e759775977c83 ("Input: acecad - simplify
> usb_acecad_disconnect()") from the input tree and commit
> 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
> and usb_buffer_free() users") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks for the fixup.

greg k-h

linux-next: manual merge of the usb tree with the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
from the usb tree.

I just used the input tree's version (which used "input->dev.parent"
instead of "&input->dev").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the usb tree with the input tree

[Greg KH]

On Thu, May 03, 2012 at 02:44:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
> wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
> input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
> from the usb tree.
> 
> I just used the input tree's version (which used "input->dev.parent"
> instead of "&input->dev").

That's fine, Dmitry and I are still "discussing" which pointer is best
to use on lkml, but either is good for the merge :)

thanks,

greg k-h