diff options
author | Joe Perches <joe@perches.com> | 2010-02-05 20:51:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:54:59 -0500 |
commit | f45ba776da4fe6c9a9eddd42b0fd5d1f15c260f3 (patch) | |
tree | d830c5552433b85caf93c72cae31ea67d45c330b /drivers/usb/host/ohci-ppc-of.c | |
parent | 759f3634267a67ac90f3fa7fc06510dfd43b4e45 (diff) |
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>
Diffstat (limited to 'drivers/usb/host/ohci-ppc-of.c')
-rw-r--r-- | drivers/usb/host/ohci-ppc-of.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 2a7def16128d..103263c230cf 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
@@ -114,21 +114,21 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) | |||
114 | hcd->rsrc_len = res.end - res.start + 1; | 114 | hcd->rsrc_len = res.end - res.start + 1; |
115 | 115 | ||
116 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { | 116 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { |
117 | printk(KERN_ERR __FILE__ ": request_mem_region failed\n"); | 117 | printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__); |
118 | rv = -EBUSY; | 118 | rv = -EBUSY; |
119 | goto err_rmr; | 119 | goto err_rmr; |
120 | } | 120 | } |
121 | 121 | ||
122 | irq = irq_of_parse_and_map(dn, 0); | 122 | irq = irq_of_parse_and_map(dn, 0); |
123 | if (irq == NO_IRQ) { | 123 | if (irq == NO_IRQ) { |
124 | printk(KERN_ERR __FILE__ ": irq_of_parse_and_map failed\n"); | 124 | printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__); |
125 | rv = -EBUSY; | 125 | rv = -EBUSY; |
126 | goto err_irq; | 126 | goto err_irq; |
127 | } | 127 | } |
128 | 128 | ||
129 | hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); | 129 | hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); |
130 | if (!hcd->regs) { | 130 | if (!hcd->regs) { |
131 | printk(KERN_ERR __FILE__ ": ioremap failed\n"); | 131 | printk(KERN_ERR "%s: ioremap failed\n", __FILE__); |
132 | rv = -ENOMEM; | 132 | rv = -ENOMEM; |
133 | goto err_ioremap; | 133 | goto err_ioremap; |
134 | } | 134 | } |
@@ -169,7 +169,7 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) | |||
169 | } else | 169 | } else |
170 | release_mem_region(res.start, 0x4); | 170 | release_mem_region(res.start, 0x4); |
171 | } else | 171 | } else |
172 | pr_debug(__FILE__ ": cannot get ehci offset from fdt\n"); | 172 | pr_debug("%s: cannot get ehci offset from fdt\n", __FILE__); |
173 | } | 173 | } |
174 | 174 | ||
175 | iounmap(hcd->regs); | 175 | iounmap(hcd->regs); |