evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

goldfish: pipe: ANDROID: Use dev_ logging instead of pr_

Browse source 
The dev_ functions are the same as the corresponding
pr_ functions, but also print identifying information
about the struct device.

Bug: 72717639
bug: 66884503
Change-Id: I0b1147cf607eb5b0b07dd9753dcf2b60e9700afe
Signed-off-by: Roman Kiryanov <rkir@google.com>
This commit is contained in:
Roman Kiryanov 2018-05-02 10:55:06 -07:00 • committed by Greg Kroah-Hartman
parent cd38dbb03d
commit 31569bb450
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/platform/goldfish/goldfish_pipe.h
View file

@ -84,6 +84,9 @@ struct goldfish_pipe_dev {
/* v1-specific access parameters */
struct access_params *aps;
/* ptr to platform device's device struct */
struct device *pdev_dev;
};
extern struct goldfish_pipe_dev goldfish_pipe_dev;

28
drivers/platform/goldfish/goldfish_pipe_v2.c
View file

@ -397,6 +397,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp,
int count = 0, ret = -EINVAL;
unsigned long address, address_end, last_page;
unsigned int last_page_size;
struct device *pdev_dev;
/* If the emulator already closed the pipe, no need to go further */
if (unlikely(test_bit(BIT_CLOSED_ON_HOST, &pipe->flags)))
@ -414,6 +415,8 @@ static ssize_t goldfish_pipe_read_write(struct file *filp,
last_page = (address_end - 1) & PAGE_MASK;
last_page_size = ((address_end - 1) & ~PAGE_MASK) + 1;
pdev_dev = pipe->dev->pdev_dev;
while (address < address_end) {
s32 consumed_size;
int status;
@ -445,7 +448,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp,
* err.
*/
if (status != PIPE_ERROR_AGAIN)
pr_err_ratelimited(
dev_err_ratelimited(pdev_dev,
"goldfish_pipe: backend error %d on %s\n",
status, is_write ? "write" : "read");
break;
@ -685,6 +688,7 @@ static int get_free_pipe_id_locked(struct goldfish_pipe_dev *dev)
static int goldfish_pipe_open(struct inode *inode, struct file *file)
{
struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;
struct device *pdev_dev;
unsigned long flags;
int id;
int status;
@ -699,6 +703,8 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
mutex_init(&pipe->lock);
init_waitqueue_head(&pipe->wake_queue);
pdev_dev = dev->pdev_dev;
/*
* Command buffer needs to be allocated on its own page to make sure it
* is physically contiguous in host's address space.
@ -706,7 +712,7 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
pipe->command_buffer =
(struct goldfish_pipe_command *)__get_free_page(GFP_KERNEL);
if (!pipe->command_buffer) {
pr_err("Could not alloc pipe command buffer!\n");
dev_err(pdev_dev, "Could not alloc pipe command buffer!\n");
status = -ENOMEM;
goto err_pipe;
}
@ -715,7 +721,7 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
id = get_free_pipe_id_locked(dev);
if (id < 0) {
pr_err("Could not get free pipe id!\n");
dev_err(pdev_dev, "Could not get free pipe id!\n");
status = id;
goto err_id_locked;
}
@ -732,7 +738,9 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
status = goldfish_pipe_cmd_locked(pipe, PIPE_CMD_OPEN);
spin_unlock_irqrestore(&dev->lock, flags);
if (status < 0) {
pr_err("Could not tell host of new pipe! status=%d\n", status);
dev_err(pdev_dev,
"Could not tell host of new pipe! status=%d\n",
status);
goto err_cmd;
}
@ -798,16 +806,17 @@ static int goldfish_pipe_device_init_v2(struct platform_device *pdev)
err = devm_request_irq(pdev_dev, dev->irq, goldfish_pipe_interrupt,
IRQF_SHARED, "goldfish_pipe", dev);
if (err) {
dev_err(&pdev->dev, "unable to allocate IRQ for v2\n");
dev_err(pdev_dev, "unable to allocate IRQ for v2\n");
return err;
}
err = misc_register(&goldfish_pipe_miscdev);
if (err) {
dev_err(&pdev->dev, "unable to register v2 device\n");
dev_err(pdev_dev, "unable to register v2 device\n");
return err;
}
dev->pdev_dev = pdev_dev;
dev->first_signalled_pipe = NULL;
dev->pipes_capacity = INITIAL_PIPES_CAPACITY;
dev->pipes = kcalloc(dev->pipes_capacity, sizeof(*dev->pipes),
@ -862,6 +871,7 @@ static int goldfish_pipe_probe(struct platform_device *pdev)
int err;
struct resource *r;
struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;
struct device *pdev_dev = &pdev->dev;
BUILD_BUG_ON(sizeof(struct goldfish_pipe_command) > PAGE_SIZE);
@ -872,12 +882,12 @@ static int goldfish_pipe_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (r == NULL || resource_size(r) < PAGE_SIZE) {
dev_err(&pdev->dev, "can't allocate i/o page\n");
dev_err(pdev_dev, "can't allocate i/o page\n");
return -EINVAL;
}
dev->base = devm_ioremap(&pdev->dev, r->start, PAGE_SIZE);
dev->base = devm_ioremap(pdev_dev, r->start, PAGE_SIZE);
if (dev->base == NULL) {
dev_err(&pdev->dev, "ioremap failed\n");
dev_err(pdev_dev, "ioremap failed\n");
return -EINVAL;
}