diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 19:08:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-25 00:16:55 -0400 |
commit | 441b62c1edb986827154768d89bbac0ba779984f (patch) | |
tree | 13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/gadget/goku_udc.c | |
parent | 14722ef4acedc643f0b78b7165ceff2d300dae4d (diff) |
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/goku_udc.c')
-rw-r--r-- | drivers/usb/gadget/goku_udc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c index d3e702576de..64a592cbbe7 100644 --- a/drivers/usb/gadget/goku_udc.c +++ b/drivers/usb/gadget/goku_udc.c | |||
@@ -692,7 +692,7 @@ static void abort_dma(struct goku_ep *ep, int status) | |||
692 | req->req.actual = (curr - req->req.dma) + 1; | 692 | req->req.actual = (curr - req->req.dma) + 1; |
693 | req->req.status = status; | 693 | req->req.status = status; |
694 | 694 | ||
695 | VDBG(ep->dev, "%s %s %s %d/%d\n", __FUNCTION__, ep->ep.name, | 695 | VDBG(ep->dev, "%s %s %s %d/%d\n", __func__, ep->ep.name, |
696 | ep->is_in ? "IN" : "OUT", | 696 | ep->is_in ? "IN" : "OUT", |
697 | req->req.actual, req->req.length); | 697 | req->req.actual, req->req.length); |
698 | 698 | ||
@@ -826,7 +826,7 @@ static int goku_dequeue(struct usb_ep *_ep, struct usb_request *_req) | |||
826 | if (dev->ep0state == EP0_SUSPEND) | 826 | if (dev->ep0state == EP0_SUSPEND) |
827 | return -EBUSY; | 827 | return -EBUSY; |
828 | 828 | ||
829 | VDBG(dev, "%s %s %s %s %p\n", __FUNCTION__, _ep->name, | 829 | VDBG(dev, "%s %s %s %s %p\n", __func__, _ep->name, |
830 | ep->is_in ? "IN" : "OUT", | 830 | ep->is_in ? "IN" : "OUT", |
831 | ep->dma ? "dma" : "pio", | 831 | ep->dma ? "dma" : "pio", |
832 | _req); | 832 | _req); |
@@ -898,7 +898,7 @@ static int goku_set_halt(struct usb_ep *_ep, int value) | |||
898 | 898 | ||
899 | /* don't change EPxSTATUS_EP_INVALID to READY */ | 899 | /* don't change EPxSTATUS_EP_INVALID to READY */ |
900 | } else if (!ep->desc) { | 900 | } else if (!ep->desc) { |
901 | DBG(ep->dev, "%s %s inactive?\n", __FUNCTION__, ep->ep.name); | 901 | DBG(ep->dev, "%s %s inactive?\n", __func__, ep->ep.name); |
902 | return -EINVAL; | 902 | return -EINVAL; |
903 | } | 903 | } |
904 | 904 | ||
@@ -940,7 +940,7 @@ static int goku_fifo_status(struct usb_ep *_ep) | |||
940 | regs = ep->dev->regs; | 940 | regs = ep->dev->regs; |
941 | size = readl(®s->EPxSizeLA[ep->num]) & DATASIZE; | 941 | size = readl(®s->EPxSizeLA[ep->num]) & DATASIZE; |
942 | size += readl(®s->EPxSizeLB[ep->num]) & DATASIZE; | 942 | size += readl(®s->EPxSizeLB[ep->num]) & DATASIZE; |
943 | VDBG(ep->dev, "%s %s %u\n", __FUNCTION__, ep->ep.name, size); | 943 | VDBG(ep->dev, "%s %s %u\n", __func__, ep->ep.name, size); |
944 | return size; | 944 | return size; |
945 | } | 945 | } |
946 | 946 | ||
@@ -953,11 +953,11 @@ static void goku_fifo_flush(struct usb_ep *_ep) | |||
953 | if (!_ep) | 953 | if (!_ep) |
954 | return; | 954 | return; |
955 | ep = container_of(_ep, struct goku_ep, ep); | 955 | ep = container_of(_ep, struct goku_ep, ep); |
956 | VDBG(ep->dev, "%s %s\n", __FUNCTION__, ep->ep.name); | 956 | VDBG(ep->dev, "%s %s\n", __func__, ep->ep.name); |
957 | 957 | ||
958 | /* don't change EPxSTATUS_EP_INVALID to READY */ | 958 | /* don't change EPxSTATUS_EP_INVALID to READY */ |
959 | if (!ep->desc && ep->num != 0) { | 959 | if (!ep->desc && ep->num != 0) { |
960 | DBG(ep->dev, "%s %s inactive?\n", __FUNCTION__, ep->ep.name); | 960 | DBG(ep->dev, "%s %s inactive?\n", __func__, ep->ep.name); |
961 | return; | 961 | return; |
962 | } | 962 | } |
963 | 963 | ||
@@ -1286,7 +1286,7 @@ static void ep0_start(struct goku_udc *dev) | |||
1286 | struct goku_udc_regs __iomem *regs = dev->regs; | 1286 | struct goku_udc_regs __iomem *regs = dev->regs; |
1287 | unsigned i; | 1287 | unsigned i; |
1288 | 1288 | ||
1289 | VDBG(dev, "%s\n", __FUNCTION__); | 1289 | VDBG(dev, "%s\n", __func__); |
1290 | 1290 | ||
1291 | udc_reset(dev); | 1291 | udc_reset(dev); |
1292 | udc_reinit (dev); | 1292 | udc_reinit (dev); |
@@ -1322,7 +1322,7 @@ static void udc_enable(struct goku_udc *dev) | |||
1322 | if (readl(&dev->regs->power_detect) & PW_DETECT) | 1322 | if (readl(&dev->regs->power_detect) & PW_DETECT) |
1323 | ep0_start(dev); | 1323 | ep0_start(dev); |
1324 | else { | 1324 | else { |
1325 | DBG(dev, "%s\n", __FUNCTION__); | 1325 | DBG(dev, "%s\n", __func__); |
1326 | dev->int_enable = INT_PWRDETECT; | 1326 | dev->int_enable = INT_PWRDETECT; |
1327 | writel(dev->int_enable, &dev->regs->int_enable); | 1327 | writel(dev->int_enable, &dev->regs->int_enable); |
1328 | } | 1328 | } |
@@ -1387,7 +1387,7 @@ stop_activity(struct goku_udc *dev, struct usb_gadget_driver *driver) | |||
1387 | { | 1387 | { |
1388 | unsigned i; | 1388 | unsigned i; |
1389 | 1389 | ||
1390 | DBG (dev, "%s\n", __FUNCTION__); | 1390 | DBG (dev, "%s\n", __func__); |
1391 | 1391 | ||
1392 | if (dev->gadget.speed == USB_SPEED_UNKNOWN) | 1392 | if (dev->gadget.speed == USB_SPEED_UNKNOWN) |
1393 | driver = NULL; | 1393 | driver = NULL; |
@@ -1726,7 +1726,7 @@ static void goku_remove(struct pci_dev *pdev) | |||
1726 | { | 1726 | { |
1727 | struct goku_udc *dev = pci_get_drvdata(pdev); | 1727 | struct goku_udc *dev = pci_get_drvdata(pdev); |
1728 | 1728 | ||
1729 | DBG(dev, "%s\n", __FUNCTION__); | 1729 | DBG(dev, "%s\n", __func__); |
1730 | 1730 | ||
1731 | BUG_ON(dev->driver); | 1731 | BUG_ON(dev->driver); |
1732 | 1732 | ||