Skip to contentSkip to conversation

usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo

PATCH New Arnd Bergmann 3 participants 3 messages Sep 29, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo

Patch "usb: gadget: uvc: rename functions to avoid conflicts with host uvc" renamed a lot of symbols but missed one references that was inside of an #ifdef:

drivers/usb/gadget/function/uvc_v4l2.c:363:23: error: 'uvcg_v4l2_get_unmapped_area' undeclared here (not in a function)
.get_unmapped_area = uvcg_v4l2_get_unmapped_area,

                       ^
drivers/usb/gadget/function/uvc_v4l2.c:344:22: warning: 'uvc_v4l2_get_unmapped_area' defined but not used [-Wunused-function]
 static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
                      ^

This renames the reference according the changed function name.

Fixes 7ea95b110811 ("usb: gadget: uvc: rename functions to avoid conflicts with host uvc")
Cc Andrzej Pietrasiewicz <[email protected]>
Cc Michael Grzeschik <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc linux-usb at vger.kernel.org

---

drivers/usb/gadget/function/uvc_v4l2.c +1 -1
index b52f2681ec21..5aad7fededa5 100644
@@ -341,7 +341,7 @@ uvc_v4l2_poll(struct file *file, poll_table *wait)
 }
 
 #ifndef CONFIG_MMU
-static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
+static unsigned long uvcg_v4l2_get_unmapped_area(struct file *file,
 		unsigned long addr, unsigned long len, unsigned long pgoff,
 		unsigned long flags)
 {
#1 lore raw

PATCH 1/1 usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo

Hi Arnd,

Thank you for the patch.

Quoted 14 lines · On Monday 29 September 2014 14:30:20 Arnd Bergmann wrote:

Patch "usb: gadget: uvc: rename functions to avoid conflicts with host uvc" renamed a lot of symbols but missed one references that was inside of an #ifdef:

drivers/usb/gadget/function/uvc_v4l2.c:363:23: error:
'uvcg_v4l2_get_unmapped_area' undeclared here (not in a function) .get_unmapped_area = uvcg_v4l2_get_unmapped_area,

                       ^

drivers/usb/gadget/function/uvc_v4l2.c:344:22: warning:
'uvc_v4l2_get_unmapped_area' defined but not used [-Wunused-function] static unsigned long uvc_v4l2_get_unmapped_area(struct file *file, ^

This renames the reference according the changed function name.

Quoted 7 lines
Fixes 7ea95b110811 ("usb: gadget: uvc: rename functions to avoid conflicts

with host uvc") Cc: Andrzej Pietrasiewicz <[email protected]>
Cc: Michael Grzeschik <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Felipe Balbi <[email protected]>
Cc: linux-usb at vger.kernel.org

Felipe, could you please this up ?

Quoted 15 lines

---

(quoted diff) +0 -0

b/drivers/usb/gadget/function/uvc_v4l2.c index b52f2681ec21..5aad7fededa5 100644

drivers/usb/gadget/function/uvc_v4l2.c +1 -1
@@ -341,7 +341,7 @@ uvc_v4l2_poll(struct file *file, poll_table *wait)
 }
 
 #ifndef CONFIG_MMU
-static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
+static unsigned long uvcg_v4l2_get_unmapped_area(struct file *file,
 		unsigned long addr, unsigned long len, unsigned long pgoff,
 		unsigned long flags)
 {
Signature · 3 lines
Regards,

Laurent Pinchart
#2 lore raw

PATCH 1/1 usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo

Quoted 27 lines · Laurent Pinchart

Hi Arnd,

Thank you for the patch.

Quoted 14 lines · On Monday 29 September 2014 14:30:20 Arnd Bergmann wrote:

Patch "usb: gadget: uvc: rename functions to avoid conflicts with host uvc" renamed a lot of symbols but missed one references that was inside of an #ifdef:

drivers/usb/gadget/function/uvc_v4l2.c:363:23: error:
'uvcg_v4l2_get_unmapped_area' undeclared here (not in a function) .get_unmapped_area = uvcg_v4l2_get_unmapped_area,

                       ^

drivers/usb/gadget/function/uvc_v4l2.c:344:22: warning:
'uvc_v4l2_get_unmapped_area' defined but not used [-Wunused-function] static unsigned long uvc_v4l2_get_unmapped_area(struct file *file, ^

This renames the reference according the changed function name.

Quoted 7 lines
Fixes 7ea95b110811 ("usb: gadget: uvc: rename functions to avoid conflicts

with host uvc") Cc: Andrzej Pietrasiewicz <[email protected]>
Cc: Michael Grzeschik <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Felipe Balbi <[email protected]>
Cc: linux-usb at vger.kernel.org

Quoted 3 lines

Felipe, could you please this up ?

I can take it.

thanks,

greg k-h