USB: Convert concatenated __FILE__ to %s, __FILE__

Reduces string space a bit
Neaten a macro redefine of dbg

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 870b98e07208..8df33b8a634c 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -134,21 +134,21 @@ ehci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
         hcd->rsrc_len = res.end - res.start + 1;
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
-                printk(KERN_ERR __FILE__ ": request_mem_region failed\n");
+                printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
                 rv = -EBUSY;
                 goto err_rmr;
         }
 
         irq = irq_of_parse_and_map(dn, 0);
         if (irq == NO_IRQ) {
-                printk(KERN_ERR __FILE__ ": irq_of_parse_and_map failed\n");
+                printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__);
                 rv = -EBUSY;
                 goto err_irq;
         }
 
         hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
         if (!hcd->regs) {
-                printk(KERN_ERR __FILE__ ": ioremap failed\n");
+                printk(KERN_ERR "%s: ioremap failed\n", __FILE__);
                 rv = -ENOMEM;
                 goto err_ioremap;
         }
@@ -161,9 +161,9 @@ ehci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
                         ehci->ohci_hcctrl_reg = ioremap(res.start +
                                         OHCI_HCCTRL_OFFSET, OHCI_HCCTRL_LEN);
                 else
-                        pr_debug(__FILE__ ": no ohci offset in fdt\n");
+                        pr_debug("%s: no ohci offset in fdt\n", __FILE__);
                 if (!ehci->ohci_hcctrl_reg) {
-                        pr_debug(__FILE__ ": ioremap for ohci hcctrl failed\n");
+                        pr_debug("%s: ioremap for ohci hcctrl failed\n", __FILE__);
                 } else {
                         ehci->has_amcc_usb23 = 1;
                 }
@@ -241,7 +241,7 @@ static int ehci_hcd_ppc_of_remove(struct of_device *op)
                                 else
                                         release_mem_region(res.start, 0x4);
                         else
-                                pr_debug(__FILE__ ": no ohci offset in fdt\n");
+                                pr_debug("%s: no ohci offset in fdt\n", __FILE__);
                         of_node_put(np);
                 }