* [PATCH] drivers: drop unused usb_gadget_{map,unmap}_request()
@ 2021-06-14 14:28 Antony Pavlov
2021-06-15 9:22 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Antony Pavlov @ 2021-06-14 14:28 UTC (permalink / raw)
To: barebox
There is no code that is dependent on
usb_gadget_{map,unmap}_request().
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
drivers/usb/gadget/udc-core.c | 55 -----------------------------------
include/usb/gadget.h | 10 -------
2 files changed, 65 deletions(-)
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 2516676f86..bd3404f9cf 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -46,61 +46,6 @@ static LIST_HEAD(udc_list);
/* ------------------------------------------------------------------------- */
-#ifdef CONFIG_KERNEL_HAS_DMA
-
-int usb_gadget_map_request(struct usb_gadget *gadget,
- struct usb_request *req, int is_in)
-{
- if (req->length == 0)
- return 0;
-
- if (req->num_sgs) {
- int mapped;
-
- mapped = dma_map_sg(&gadget->dev, req->sg, req->num_sgs,
- is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
- if (mapped == 0) {
- dev_err(&gadget->dev, "failed to map SGs\n");
- return -EFAULT;
- }
-
- req->num_mapped_sgs = mapped;
- } else {
- req->dma = dma_map_single(&gadget->dev, req->buf, req->length,
- is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
-
- if (dma_mapping_error(&gadget->dev, req->dma)) {
- dev_err(&gadget->dev, "failed to map buffer\n");
- return -EFAULT;
- }
- }
-
- return 0;
-}
-EXPORT_SYMBOL_GPL(usb_gadget_map_request);
-
-void usb_gadget_unmap_request(struct usb_gadget *gadget,
- struct usb_request *req, int is_in)
-{
- if (req->length == 0)
- return;
-
- if (req->num_mapped_sgs) {
- dma_unmap_sg(&gadget->dev, req->sg, req->num_mapped_sgs,
- is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
-
- req->num_mapped_sgs = 0;
- } else {
- dma_unmap_single(&gadget->dev, req->dma, req->length,
- is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
- }
-}
-EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
-
-#endif /* CONFIG_HAS_DMA */
-
-/* ------------------------------------------------------------------------- */
-
void usb_gadget_set_state(struct usb_gadget *gadget,
enum usb_device_state state)
{
diff --git a/include/usb/gadget.h b/include/usb/gadget.h
index 3e1d7153dc..431f316c46 100644
--- a/include/usb/gadget.h
+++ b/include/usb/gadget.h
@@ -1002,16 +1002,6 @@ void usb_free_all_descriptors(struct usb_function *f);
/*-------------------------------------------------------------------------*/
-/* utility to simplify map/unmap of usb_requests to/from DMA */
-
-extern int usb_gadget_map_request(struct usb_gadget *gadget,
- struct usb_request *req, int is_in);
-
-extern void usb_gadget_unmap_request(struct usb_gadget *gadget,
- struct usb_request *req, int is_in);
-
-/*-------------------------------------------------------------------------*/
-
/* utility to set gadget state properly */
extern void usb_gadget_set_state(struct usb_gadget *gadget,
--
2.32.0.rc0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers: drop unused usb_gadget_{map,unmap}_request()
2021-06-14 14:28 [PATCH] drivers: drop unused usb_gadget_{map,unmap}_request() Antony Pavlov
@ 2021-06-15 9:22 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2021-06-15 9:22 UTC (permalink / raw)
To: Antony Pavlov; +Cc: barebox
On Mon, Jun 14, 2021 at 05:28:33PM +0300, Antony Pavlov wrote:
> There is no code that is dependent on
> usb_gadget_{map,unmap}_request().
My first reaction was: But maybe there *should* be code depending on
that, but
> -#ifdef CONFIG_KERNEL_HAS_DMA
> -
> -int usb_gadget_map_request(struct usb_gadget *gadget,
> - struct usb_request *req, int is_in)
> -{
> - if (req->length == 0)
> - return 0;
> -
> - if (req->num_sgs) {
> - int mapped;
> -
> - mapped = dma_map_sg(&gadget->dev, req->sg, req->num_sgs,
> - is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
Trying to use it would at least fail when trying to link this. We don't
have any implementation for dma_map_sg().
So ok to remove this nonfunctional code.
Sascha
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-15 15:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-14 14:28 [PATCH] drivers: drop unused usb_gadget_{map,unmap}_request() Antony Pavlov
2021-06-15 9:22 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox