Browse Source

staging: xillybus: Use dev_* functions instead of pr_* in xillybus_of

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Eli Billauer <eli.billauer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eli Billauer 12 years ago
parent
commit
1a2f9a9ea5
1 changed files with 8 additions and 6 deletions
  1. 8 6
      drivers/staging/xillybus/xillybus_of.c

+ 8 - 6
drivers/staging/xillybus/xillybus_of.c

@@ -117,14 +117,15 @@ static int xilly_drv_probe(struct platform_device *op)
 
 
 	rc = of_address_to_resource(dev->of_node, 0, &endpoint->res);
 	rc = of_address_to_resource(dev->of_node, 0, &endpoint->res);
 	if (rc) {
 	if (rc) {
-		pr_warn("xillybus: Failed to obtain device tree "
-			"resource\n");
+		dev_warn(endpoint->dev,
+			 "Failed to obtain device tree resource\n");
 		goto failed_request_regions;
 		goto failed_request_regions;
 	}
 	}
 
 
 	if  (!request_mem_region(endpoint->res.start,
 	if  (!request_mem_region(endpoint->res.start,
 				 resource_size(&endpoint->res), xillyname)) {
 				 resource_size(&endpoint->res), xillyname)) {
-		pr_err("xillybus: request_mem_region failed. Aborting.\n");
+		dev_err(endpoint->dev,
+			"request_mem_region failed. Aborting.\n");
 		rc = -EBUSY;
 		rc = -EBUSY;
 		goto failed_request_regions;
 		goto failed_request_regions;
 	}
 	}
@@ -132,7 +133,8 @@ static int xilly_drv_probe(struct platform_device *op)
 	endpoint->registers = of_iomap(dev->of_node, 0);
 	endpoint->registers = of_iomap(dev->of_node, 0);
 
 
 	if (!endpoint->registers) {
 	if (!endpoint->registers) {
-		pr_err("xillybus: Failed to map I/O memory. Aborting.\n");
+		dev_err(endpoint->dev,
+			"Failed to map I/O memory. Aborting.\n");
 		goto failed_iomap0;
 		goto failed_iomap0;
 	}
 	}
 
 
@@ -141,8 +143,8 @@ static int xilly_drv_probe(struct platform_device *op)
 	rc = request_irq(irq, xillybus_isr, 0, xillyname, endpoint);
 	rc = request_irq(irq, xillybus_isr, 0, xillyname, endpoint);
 
 
 	if (rc) {
 	if (rc) {
-		pr_err("xillybus: Failed to register IRQ handler. "
-		       "Aborting.\n");
+		dev_err(endpoint->dev,
+			"Failed to register IRQ handler. Aborting.\n");
 		rc = -ENODEV;
 		rc = -ENODEV;
 		goto failed_register_irq;
 		goto failed_register_irq;
 	}
 	}