mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: renesas_usbhs: change arguments of dma_map_ctrl()

Browse Source 
Since usbhsg_dma_map_ctrl() needs DMA device structure in the near future,
this patch changes arguments of dma_map_ctrl() to give such data.
(This patch is only change the argument.)

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Yoshihiro Shimoda
2016-04-18 16:53:41 +09:00
committed by Felipe Balbi
parent e789ece182
commit c3cdcac786
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/renesas_usbhs/fifo.c
View File

@@ -799,8 +799,10 @@ static int __usbhsf_dma_map_ctrl(struct usbhs_pkt *pkt, int map)
struct usbhs_pipe *pipe = pkt->pipe; struct usbhs_pipe *pipe = pkt->pipe;
struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe); struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv); struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
struct usbhs_fifo *fifo = usbhs_pipe_to_fifo(pipe);
struct dma_chan *chan = usbhsf_dma_chan_get(fifo, pkt);
return info->dma_map_ctrl(pkt, map); return info->dma_map_ctrl(chan->device->dev, pkt, map);
} }
static void usbhsf_dma_complete(void *arg); static void usbhsf_dma_complete(void *arg);

3
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@@ -191,7 +191,8 @@ static void usbhsg_queue_push(struct usbhsg_uep *uep,
/* /*
* dma map/unmap * dma map/unmap
*/ */
static int usbhsg_dma_map_ctrl(struct usbhs_pkt *pkt, int map) static int usbhsg_dma_map_ctrl(struct device *dma_dev, struct usbhs_pkt *pkt,
int map)
{ {
struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt); struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
struct usb_request *req = &ureq->req; struct usb_request *req = &ureq->req;

3
drivers/usb/renesas_usbhs/mod_host.c
View File

@@ -929,7 +929,8 @@ static int usbhsh_dcp_queue_push(struct usb_hcd *hcd,
/* /*
* dma map functions * dma map functions
*/ */
static int usbhsh_dma_map_ctrl(struct usbhs_pkt *pkt, int map) static int usbhsh_dma_map_ctrl(struct device *dma_dev, struct usbhs_pkt *pkt,
int map)
{ {
if (map) { if (map) {
struct usbhsh_request *ureq = usbhsh_pkt_to_ureq(pkt); struct usbhsh_request *ureq = usbhsh_pkt_to_ureq(pkt);

3
drivers/usb/renesas_usbhs/pipe.c
View File

@@ -655,7 +655,8 @@ static void usbhsp_put_pipe(struct usbhs_pipe *pipe)
} }
void usbhs_pipe_init(struct usbhs_priv *priv, void usbhs_pipe_init(struct usbhs_priv *priv,
int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map)) int (*dma_map_ctrl)(struct device *dma_dev,
struct usbhs_pkt *pkt, int map))
{ {
struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv); struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
struct usbhs_pipe *pipe; struct usbhs_pipe *pipe;

6
drivers/usb/renesas_usbhs/pipe.h
View File

@@ -47,7 +47,8 @@ struct usbhs_pipe_info {
struct usbhs_pipe *pipe; struct usbhs_pipe *pipe;
int size; /* array size of "pipe" */ int size; /* array size of "pipe" */
int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map); int (*dma_map_ctrl)(struct device *dma_dev, struct usbhs_pkt *pkt,
int map);
}; };
/* /*
@@ -84,7 +85,8 @@ int usbhs_pipe_is_running(struct usbhs_pipe *pipe);
void usbhs_pipe_running(struct usbhs_pipe *pipe, int running); void usbhs_pipe_running(struct usbhs_pipe *pipe, int running);
void usbhs_pipe_init(struct usbhs_priv *priv, void usbhs_pipe_init(struct usbhs_priv *priv,
int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map)); int (*dma_map_ctrl)(struct device *dma_dev,
struct usbhs_pkt *pkt, int map));
int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe); int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe);
void usbhs_pipe_clear(struct usbhs_pipe *pipe); void usbhs_pipe_clear(struct usbhs_pipe *pipe);
int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe); int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);