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

Commit 9846d12d authored by Roman Kiryanov's avatar Roman Kiryanov
Browse files

goldfish: pipe: ANDROID: rename global variables 



We don't need an array of 1 for pipe_dev and
use better names to distinguish between
goldfish_pipe_dev and miscdevice.

Bug: 72717639
Bug: 66884503
Change-Id: Iab040c158745f034ca8e9569fd49c84933b1c4ba
Signed-off-by: default avatarRoman Kiryanov <rkir@google.com>
parent d176c577

drivers/platform/goldfish/goldfish_pipe.c

+6 −5
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ static irqreturn_t goldfish_pipe_interrupt(int irq, void *dev_id) 
static int goldfish_pipe_open(struct inode *inode, struct file *file)

{

	struct goldfish_pipe *pipe;

	struct goldfish_pipe_dev *dev = pipe_dev;

	struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;

	int32_t status;



	/* Allocate new pipe kernel object */
@@ -558,7 +558,7 @@ static const struct file_operations goldfish_pipe_fops = { 
	.release = goldfish_pipe_release,

};



static struct miscdevice goldfish_pipe_dev = {

static struct miscdevice goldfish_pipe_miscdev = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "goldfish_pipe",

	.fops = &goldfish_pipe_fops,
@@ -566,15 +566,16 @@ static struct miscdevice goldfish_pipe_dev = { 


int goldfish_pipe_device_init_v1(struct platform_device *pdev)

{

	struct goldfish_pipe_dev *dev = pipe_dev;

	struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;

	int 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 v1\n");

		return err;

	}



	err = misc_register(&goldfish_pipe_dev);

	err = misc_register(&goldfish_pipe_miscdev);

	if (err) {

		dev_err(&pdev->dev, "unable to register v1 device\n");

		return err;
@@ -586,5 +587,5 @@ int goldfish_pipe_device_init_v1(struct platform_device *pdev) 


void goldfish_pipe_device_deinit_v1(struct platform_device *pdev)

{

	misc_deregister(&goldfish_pipe_dev);

	misc_deregister(&goldfish_pipe_miscdev);

}

drivers/platform/goldfish/goldfish_pipe.h

+1 −1
Original line number Diff line number Diff line
@@ -86,6 +86,6 @@ struct goldfish_pipe_dev { 
	struct access_params *aps;

};



extern struct goldfish_pipe_dev pipe_dev[1];

extern struct goldfish_pipe_dev goldfish_pipe_dev;



#endif /* GOLDFISH_PIPE_H */

drivers/platform/goldfish/goldfish_pipe_v2.c

+15 −14
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ struct goldfish_pipe { 
	struct goldfish_pipe_dev *dev;

};



struct goldfish_pipe_dev pipe_dev[1] = {};

struct goldfish_pipe_dev goldfish_pipe_dev;



static int goldfish_cmd_locked(struct goldfish_pipe *pipe, enum PipeCmdCode cmd)

{
@@ -572,11 +572,12 @@ static struct goldfish_pipe *signalled_pipes_pop_front( 


static void goldfish_interrupt_task(unsigned long unused)

{

	struct goldfish_pipe_dev *dev = pipe_dev;

	/* Iterate over the signalled pipes and wake them one by one */

	struct goldfish_pipe *pipe;

	int wakes;

	while ((pipe = signalled_pipes_pop_front(dev, &wakes)) != NULL) {



	while ((pipe = signalled_pipes_pop_front(&goldfish_pipe_dev, &wakes)) !=

			NULL) {

		if (wakes & PIPE_WAKE_CLOSED) {

			pipe->flags = 1 << BIT_CLOSED_ON_HOST;

		} else {
@@ -613,7 +614,8 @@ static irqreturn_t goldfish_pipe_interrupt(int irq, void *dev_id) 
	u32 i;

	unsigned long flags;

	struct goldfish_pipe_dev *dev = dev_id;

	if (dev != pipe_dev)



	if (dev != &goldfish_pipe_dev)

		return IRQ_NONE;



	/* Request the signalled pipes from the device */
@@ -676,7 +678,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 = pipe_dev;

	struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;

	unsigned long flags;

	int id;

	int status;
@@ -773,7 +775,7 @@ static const struct file_operations goldfish_pipe_fops = { 
	.release = goldfish_pipe_release,

};



static struct miscdevice goldfish_pipe_dev = {

static struct miscdevice goldfish_pipe_miscdev = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "goldfish_pipe",

	.fops = &goldfish_pipe_fops,
@@ -782,7 +784,7 @@ static struct miscdevice goldfish_pipe_dev = { 
static int goldfish_pipe_device_init_v2(struct platform_device *pdev)

{

	char *page;

	struct goldfish_pipe_dev *dev = pipe_dev;

	struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;

	int err = devm_request_irq(&pdev->dev, dev->irq, goldfish_pipe_interrupt,

				IRQF_SHARED, "goldfish_pipe", dev);

	if (err) {
@@ -790,7 +792,7 @@ static int goldfish_pipe_device_init_v2(struct platform_device *pdev) 
		return err;

	}



	err = misc_register(&goldfish_pipe_dev);

	err = misc_register(&goldfish_pipe_miscdev);

	if (err) {

		dev_err(&pdev->dev, "unable to register v2 device\n");

		return err;
@@ -839,17 +841,16 @@ static int goldfish_pipe_device_init_v2(struct platform_device *pdev) 
}



static void goldfish_pipe_device_deinit_v2(struct platform_device *pdev) {

	struct goldfish_pipe_dev *dev = pipe_dev;

	misc_deregister(&goldfish_pipe_dev);

	kfree(dev->pipes);

	free_page((unsigned long)dev->buffers);

	misc_deregister(&goldfish_pipe_miscdev);

	kfree(goldfish_pipe_dev.pipes);

	free_page((unsigned long)goldfish_pipe_dev.buffers);

}



static int goldfish_pipe_probe(struct platform_device *pdev)

{

	int err;

	struct resource *r;

	struct goldfish_pipe_dev *dev = pipe_dev;

	struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;



	BUILD_BUG_ON(sizeof(struct goldfish_pipe_command) > PAGE_SIZE);
@@ -902,7 +903,7 @@ error: 


static int goldfish_pipe_remove(struct platform_device *pdev)

{

	struct goldfish_pipe_dev *dev = pipe_dev;

	struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;



	if (dev->version < PIPE_CURRENT_DEVICE_VERSION)

		goldfish_pipe_device_deinit_v1(pdev);