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

Commit 65adb86d authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] budget-core: fix sparse warnings 



Fixes these sparse warnings.

drivers/media/pci/ttpci/budget-core.c:250:17: warning: context imbalance in 'ttpci_budget_debiread' - different lock contexts for basic block
drivers/media/pci/ttpci/budget-core.c:289:17: warning: context imbalance in 'ttpci_budget_debiwrite' - different lock contexts for basic block

To be honest, the new code does look better than the old.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e5b30145

drivers/media/pci/ttpci/budget-core.c

+49 −40
Original line number Diff line number Diff line
@@ -231,63 +231,59 @@ static void vpeirq(unsigned long data) 
}





int ttpci_budget_debiread(struct budget *budget, u32 config, int addr, int count,

			  int uselocks, int nobusyloop)

static int ttpci_budget_debiread_nolock(struct budget *budget, u32 config,

		int addr, int count, int nobusyloop)

{

	struct saa7146_dev *saa = budget->dev;

	int result = 0;

	unsigned long flags = 0;



	if (count > 4 || count <= 0)

		return 0;



	if (uselocks)

		spin_lock_irqsave(&budget->debilock, flags);

	int result;



	if ((result = saa7146_wait_for_debi_done(saa, nobusyloop)) < 0) {

		if (uselocks)

			spin_unlock_irqrestore(&budget->debilock, flags);

	result = saa7146_wait_for_debi_done(saa, nobusyloop);

	if (result < 0)

		return result;

	}



	saa7146_write(saa, DEBI_COMMAND, (count << 17) | 0x10000 | (addr & 0xffff));

	saa7146_write(saa, DEBI_CONFIG, config);

	saa7146_write(saa, DEBI_PAGE, 0);

	saa7146_write(saa, MC2, (2 << 16) | 2);



	if ((result = saa7146_wait_for_debi_done(saa, nobusyloop)) < 0) {

		if (uselocks)

			spin_unlock_irqrestore(&budget->debilock, flags);

	result = saa7146_wait_for_debi_done(saa, nobusyloop);

	if (result < 0)

		return result;

	}



	result = saa7146_read(saa, DEBI_AD);

	result &= (0xffffffffUL >> ((4 - count) * 8));



	if (uselocks)

		spin_unlock_irqrestore(&budget->debilock, flags);



	return result;

}



int ttpci_budget_debiwrite(struct budget *budget, u32 config, int addr,

			   int count, u32 value, int uselocks, int nobusyloop)

int ttpci_budget_debiread(struct budget *budget, u32 config, int addr, int count,

			  int uselocks, int nobusyloop)

{

	struct saa7146_dev *saa = budget->dev;

	unsigned long flags = 0;

	int result;



	if (count > 4 || count <= 0)

		return 0;



	if (uselocks)

		spin_lock_irqsave(&budget->debilock, flags);

	if (uselocks) {

		unsigned long flags;

		int result;



	if ((result = saa7146_wait_for_debi_done(saa, nobusyloop)) < 0) {

		if (uselocks)

		spin_lock_irqsave(&budget->debilock, flags);

		result = ttpci_budget_debiread_nolock(budget, config, addr,

						      count, nobusyloop);

		spin_unlock_irqrestore(&budget->debilock, flags);

		return result;

	}

	return ttpci_budget_debiread_nolock(budget, config, addr,

					    count, nobusyloop);

}



static int ttpci_budget_debiwrite_nolock(struct budget *budget, u32 config,

		int addr, int count, u32 value, int nobusyloop)

{

	struct saa7146_dev *saa = budget->dev;

	int result;



	result = saa7146_wait_for_debi_done(saa, nobusyloop);

	if (result < 0)

		return result;



	saa7146_write(saa, DEBI_COMMAND, (count << 17) | 0x00000 | (addr & 0xffff));

	saa7146_write(saa, DEBI_CONFIG, config);
@@ -295,15 +291,28 @@ int ttpci_budget_debiwrite(struct budget *budget, u32 config, int addr, 
	saa7146_write(saa, DEBI_AD, value);

	saa7146_write(saa, MC2, (2 << 16) | 2);



	if ((result = saa7146_wait_for_debi_done(saa, nobusyloop)) < 0) {

		if (uselocks)

			spin_unlock_irqrestore(&budget->debilock, flags);

		return result;

	result = saa7146_wait_for_debi_done(saa, nobusyloop);

	return result < 0 ? result : 0;

}



	if (uselocks)

		spin_unlock_irqrestore(&budget->debilock, flags);

int ttpci_budget_debiwrite(struct budget *budget, u32 config, int addr,

			   int count, u32 value, int uselocks, int nobusyloop)

{

	if (count > 4 || count <= 0)

		return 0;



	if (uselocks) {

		unsigned long flags;

		int result;



		spin_lock_irqsave(&budget->debilock, flags);

		result = ttpci_budget_debiwrite_nolock(budget, config, addr,

						count, value, nobusyloop);

		spin_unlock_irqrestore(&budget->debilock, flags);

		return result;

	}

	return ttpci_budget_debiwrite_nolock(budget, config, addr,

					     count, value, nobusyloop);

}