Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f45ba776 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

USB: Convert concatenated __FILE__ to %s, __FILE__ 



Reduces string space a bit
Neaten a macro redefine of dbg

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 759f3634

drivers/usb/host/ehci-ppc-of.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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;

	hcd->rsrc_len = res.end - res.start + 1;





	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {

	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;

		rv = -EBUSY;

		goto err_rmr;

		goto err_rmr;

	}

	}





	irq = irq_of_parse_and_map(dn, 0);

	irq = irq_of_parse_and_map(dn, 0);

	if (irq == NO_IRQ) {

	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;

		rv = -EBUSY;

		goto err_irq;

		goto err_irq;

	}

	}





	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs) {

	if (!hcd->regs) {

		printk(KERN_ERR __FILE__ ": ioremap failed\n");

		printk(KERN_ERR "%s: ioremap failed\n", __FILE__);

		rv = -ENOMEM;

		rv = -ENOMEM;

		goto err_ioremap;

		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 +

			ehci->ohci_hcctrl_reg = ioremap(res.start +

					OHCI_HCCTRL_OFFSET, OHCI_HCCTRL_LEN);

					OHCI_HCCTRL_OFFSET, OHCI_HCCTRL_LEN);

		else

		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) {

		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 {

		} else {

			ehci->has_amcc_usb23 = 1;

			ehci->has_amcc_usb23 = 1;

		}

		}
@@ -241,7 +241,7 @@ static int ehci_hcd_ppc_of_remove(struct of_device *op) 
				else

				else

					release_mem_region(res.start, 0x4);

					release_mem_region(res.start, 0x4);

			else

			else

				pr_debug(__FILE__ ": no ohci offset in fdt\n");

				pr_debug("%s: no ohci offset in fdt\n", __FILE__);

			of_node_put(np);

			of_node_put(np);

		}

		}

drivers/usb/host/ehci-xilinx-of.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -177,21 +177,21 @@ ehci_hcd_xilinx_of_probe(struct of_device *op, const struct of_device_id *match) 
	hcd->rsrc_len = res.end - res.start + 1;

	hcd->rsrc_len = res.end - res.start + 1;





	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {

	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;

		rv = -EBUSY;

		goto err_rmr;

		goto err_rmr;

	}

	}





	irq = irq_of_parse_and_map(dn, 0);

	irq = irq_of_parse_and_map(dn, 0);

	if (irq == NO_IRQ) {

	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;

		rv = -EBUSY;

		goto err_irq;

		goto err_irq;

	}

	}





	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs) {

	if (!hcd->regs) {

		printk(KERN_ERR __FILE__ ": ioremap failed\n");

		printk(KERN_ERR "%s: ioremap failed\n", __FILE__);

		rv = -ENOMEM;

		rv = -ENOMEM;

		goto err_ioremap;

		goto err_ioremap;

	}

	}

drivers/usb/host/ohci-dbg.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -53,13 +53,13 @@ urb_print(struct urb * urb, char * str, int small, int status) 
		int i, len;

		int i, len;





		if (usb_pipecontrol (pipe)) {

		if (usb_pipecontrol (pipe)) {

			printk (KERN_DEBUG __FILE__ ": setup(8):");

			printk (KERN_DEBUG "%s: setup(8):", __FILE__);

			for (i = 0; i < 8 ; i++)

			for (i = 0; i < 8 ; i++)

				printk (" %02x", ((__u8 *) urb->setup_packet) [i]);

				printk (" %02x", ((__u8 *) urb->setup_packet) [i]);

			printk ("\n");

			printk ("\n");

		}

		}

		if (urb->transfer_buffer_length > 0 && urb->transfer_buffer) {

		if (urb->transfer_buffer_length > 0 && urb->transfer_buffer) {

			printk (KERN_DEBUG __FILE__ ": data(%d/%d):",

			printk (KERN_DEBUG "%s: data(%d/%d):", __FILE__,

				urb->actual_length,

				urb->actual_length,

				urb->transfer_buffer_length);

				urb->transfer_buffer_length);

			len = usb_pipeout (pipe)?

			len = usb_pipeout (pipe)?

drivers/usb/host/ohci-lh7a404.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -28,8 +28,8 @@ extern int usb_disabled(void); 




static void lh7a404_start_hc(struct platform_device *dev)

static void lh7a404_start_hc(struct platform_device *dev)

{

{

	printk(KERN_DEBUG __FILE__

	printk(KERN_DEBUG "%s: starting LH7A404 OHCI USB Controller\n",

	       ": starting LH7A404 OHCI USB Controller\n");

	       __FILE__);





	/*

	/*

	 * Now, carefully enable the USB clock, and take

	 * Now, carefully enable the USB clock, and take
@@ -39,14 +39,13 @@ static void lh7a404_start_hc(struct platform_device *dev) 
	udelay(1000);

	udelay(1000);

	USBH_CMDSTATUS = OHCI_HCR;

	USBH_CMDSTATUS = OHCI_HCR;





	printk(KERN_DEBUG __FILE__

	printk(KERN_DEBUG "%s: Clock to USB host has been enabled \n", __FILE__);

		   ": Clock to USB host has been enabled \n");

}

}





static void lh7a404_stop_hc(struct platform_device *dev)

static void lh7a404_stop_hc(struct platform_device *dev)

{

{

	printk(KERN_DEBUG __FILE__

	printk(KERN_DEBUG "%s: stopping LH7A404 OHCI USB Controller\n",

	       ": stopping LH7A404 OHCI USB Controller\n");

	       __FILE__);





	CSC_PWRCNT &= ~CSC_PWRCNT_USBH_EN; /* Disable clock */

	CSC_PWRCNT &= ~CSC_PWRCNT_USBH_EN; /* Disable clock */

}

}

drivers/usb/host/ohci-ppc-of.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -114,21 +114,21 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) 
	hcd->rsrc_len = res.end - res.start + 1;

	hcd->rsrc_len = res.end - res.start + 1;





	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {

	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;

		rv = -EBUSY;

		goto err_rmr;

		goto err_rmr;

	}

	}





	irq = irq_of_parse_and_map(dn, 0);

	irq = irq_of_parse_and_map(dn, 0);

	if (irq == NO_IRQ) {

	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;

		rv = -EBUSY;

		goto err_irq;

		goto err_irq;

	}

	}





	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs) {

	if (!hcd->regs) {

		printk(KERN_ERR __FILE__ ": ioremap failed\n");

		printk(KERN_ERR "%s: ioremap failed\n", __FILE__);

		rv = -ENOMEM;

		rv = -ENOMEM;

		goto err_ioremap;

		goto err_ioremap;

	}

	}
@@ -169,7 +169,7 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match) 
			} else

			} else

				release_mem_region(res.start, 0x4);

				release_mem_region(res.start, 0x4);

		} else

		} else

		    pr_debug(__FILE__ ": cannot get ehci offset from fdt\n");

			pr_debug("%s: cannot get ehci offset from fdt\n", __FILE__);

	}

	}





	iounmap(hcd->regs);

	iounmap(hcd->regs);