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/ehci-xilinx-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/ehci-xilinx-of.c')
-rw-r--r-- | drivers/usb/host/ehci-xilinx-of.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c index 4937de7b9e56..f603bb2c0a8e 100644 --- a/drivers/usb/host/ehci-xilinx-of.c +++ b/drivers/usb/host/ehci-xilinx-of.c | |||
@@ -177,21 +177,21 @@ ehci_hcd_xilinx_of_probe(struct of_device *op, const struct of_device_id *match) | |||
177 | hcd->rsrc_len = res.end - res.start + 1; | 177 | hcd->rsrc_len = res.end - res.start + 1; |
178 | 178 | ||
179 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { | 179 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { |
180 | printk(KERN_ERR __FILE__ ": request_mem_region failed\n"); | 180 | printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__); |
181 | rv = -EBUSY; | 181 | rv = -EBUSY; |
182 | goto err_rmr; | 182 | goto err_rmr; |
183 | } | 183 | } |
184 | 184 | ||
185 | irq = irq_of_parse_and_map(dn, 0); | 185 | irq = irq_of_parse_and_map(dn, 0); |
186 | if (irq == NO_IRQ) { | 186 | if (irq == NO_IRQ) { |
187 | printk(KERN_ERR __FILE__ ": irq_of_parse_and_map failed\n"); | 187 | printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__); |
188 | rv = -EBUSY; | 188 | rv = -EBUSY; |
189 | goto err_irq; | 189 | goto err_irq; |
190 | } | 190 | } |
191 | 191 | ||
192 | hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); | 192 | hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); |
193 | if (!hcd->regs) { | 193 | if (!hcd->regs) { |
194 | printk(KERN_ERR __FILE__ ": ioremap failed\n"); | 194 | printk(KERN_ERR "%s: ioremap failed\n", __FILE__); |
195 | rv = -ENOMEM; | 195 | rv = -ENOMEM; |
196 | goto err_ioremap; | 196 | goto err_ioremap; |
197 | } | 197 | } |