ACPI: pci_link: clean up whitespace (1c9ca3a7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/acpi/pci_link.c

+27 −46

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ ACPI_MODULE_NAME("pci_link");
	#define ACPI_PCI_LINK_FILE_INFO "info"		#define ACPI_PCI_LINK_FILE_INFO "info"
	#define ACPI_PCI_LINK_FILE_STATUS "state"		#define ACPI_PCI_LINK_FILE_STATUS "state"
	#define ACPI_PCI_LINK_MAX_POSSIBLE 16		#define ACPI_PCI_LINK_MAX_POSSIBLE 16

	static int acpi_pci_link_add(struct acpi_device *device);		static int acpi_pci_link_add(struct acpi_device *device);
	static int acpi_pci_link_remove(struct acpi_device *device, int type);		static int acpi_pci_link_remove(struct acpi_device *device, int type);

	@@ -104,13 +105,12 @@ static DEFINE_MUTEX(acpi_link_lock);
	/*		/*
	* set context (link) possible list from resource list		* set context (link) possible list from resource list
	*/		*/
	static acpi_status		static acpi_status acpi_pci_link_check_possible(struct acpi_resource *resource,
	acpi_pci_link_check_possible(struct acpi_resource resource, void context)		void *context)
	{		{
	struct acpi_pci_link *link = context;		struct acpi_pci_link *link = context;
	u32 i = 0;		u32 i = 0;


	switch (resource->type) {		switch (resource->type) {
	case ACPI_RESOURCE_TYPE_START_DEPENDENT:		case ACPI_RESOURCE_TYPE_START_DEPENDENT:
	case ACPI_RESOURCE_TYPE_END_TAG:		case ACPI_RESOURCE_TYPE_END_TAG:
	@@ -179,7 +179,6 @@ static int acpi_pci_link_get_possible(struct acpi_pci_link *link)
	{		{
	acpi_status status;		acpi_status status;


	if (!link)		if (!link)
	return -EINVAL;		return -EINVAL;

	@@ -197,12 +196,11 @@ static int acpi_pci_link_get_possible(struct acpi_pci_link *link)
	return 0;		return 0;
	}		}

	static acpi_status		static acpi_status acpi_pci_link_check_current(struct acpi_resource *resource,
	acpi_pci_link_check_current(struct acpi_resource resource, void context)		void *context)
	{		{
	int irq = (int )context;		int irq = (int )context;


	switch (resource->type) {		switch (resource->type) {
	case ACPI_RESOURCE_TYPE_START_DEPENDENT:		case ACPI_RESOURCE_TYPE_START_DEPENDENT:
	case ACPI_RESOURCE_TYPE_END_TAG:		case ACPI_RESOURCE_TYPE_END_TAG:
	@@ -316,7 +314,6 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
	} *resource;		} *resource;
	struct acpi_buffer buffer = { 0, NULL };		struct acpi_buffer buffer = { 0, NULL };


	if (!link \|\| !irq)		if (!link \|\| !irq)
	return -EINVAL;		return -EINVAL;

	@@ -492,12 +489,10 @@ int __init acpi_irq_penalty_init(void)
	struct acpi_pci_link *link = NULL;		struct acpi_pci_link *link = NULL;
	int i = 0;		int i = 0;


	/*		/*
	* Update penalties to facilitate IRQ balancing.		* Update penalties to facilitate IRQ balancing.
	*/		*/
	list_for_each(node, &acpi_link.entries) {		list_for_each(node, &acpi_link.entries) {

	link = list_entry(node, struct acpi_pci_link, node);		link = list_entry(node, struct acpi_pci_link, node);
	if (!link) {		if (!link) {
	printk(KERN_ERR PREFIX "Invalid link context\n");		printk(KERN_ERR PREFIX "Invalid link context\n");
	@@ -527,7 +522,6 @@ int __init acpi_irq_penalty_init(void)
	}		}
	/* Add a penalty for the SCI */		/* Add a penalty for the SCI */
	acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING;		acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING;

	return 0;		return 0;
	}		}

	@@ -538,7 +532,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
	int irq;		int irq;
	int i;		int i;


	if (link->irq.initialized) {		if (link->irq.initialized) {
	if (link->refcnt == 0)		if (link->refcnt == 0)
	/* This means the link is disabled but initialized */		/* This means the link is disabled but initialized */
	@@ -566,11 +559,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
	/*		/*
	* if active found, use it; else pick entry from end of possible list.		* if active found, use it; else pick entry from end of possible list.
	*/		*/
	if (link->irq.active) {		if (link->irq.active)
	irq = link->irq.active;		irq = link->irq.active;
	} else {		else
	irq = link->irq.possible[link->irq.possible_count - 1];		irq = link->irq.possible[link->irq.possible_count - 1];
	}

	if (acpi_irq_balance \|\| !link->irq.active) {		if (acpi_irq_balance \|\| !link->irq.active) {
	/*		/*
	@@ -599,7 +591,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
	}		}

	link->irq.initialized = 1;		link->irq.initialized = 1;

	return 0;		return 0;
	}		}

	@@ -608,17 +599,13 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
	* success: return IRQ >= 0		* success: return IRQ >= 0
	* failure: return -1		* failure: return -1
	*/		*/
			int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
	int		int polarity, char *name)
	acpi_pci_link_allocate_irq(acpi_handle handle,
	int index,
	int triggering, int polarity, char **name)
	{		{
	int result = 0;		int result = 0;
	struct acpi_device *device = NULL;		struct acpi_device *device = NULL;
	struct acpi_pci_link *link = NULL;		struct acpi_pci_link *link = NULL;


	result = acpi_bus_get_device(handle, &device);		result = acpi_bus_get_device(handle, &device);
	if (result) {		if (result) {
	printk(KERN_ERR PREFIX "Invalid link device\n");		printk(KERN_ERR PREFIX "Invalid link device\n");
	@@ -673,7 +660,6 @@ int acpi_pci_link_free_irq(acpi_handle handle)
	struct acpi_pci_link *link = NULL;		struct acpi_pci_link *link = NULL;
	acpi_status result;		acpi_status result;


	result = acpi_bus_get_device(handle, &device);		result = acpi_bus_get_device(handle, &device);
	if (result) {		if (result) {
	printk(KERN_ERR PREFIX "Invalid link device\n");		printk(KERN_ERR PREFIX "Invalid link device\n");
	@@ -708,9 +694,9 @@ int acpi_pci_link_free_irq(acpi_handle handle)
	"Link %s is dereferenced\n",		"Link %s is dereferenced\n",
	acpi_device_bid(link->device)));		acpi_device_bid(link->device)));

	if (link->refcnt == 0) {		if (link->refcnt == 0)
	acpi_evaluate_object(link->device->handle, "_DIS", NULL, NULL);		acpi_evaluate_object(link->device->handle, "_DIS", NULL, NULL);
	}
	mutex_unlock(&acpi_link_lock);		mutex_unlock(&acpi_link_lock);
	return (link->irq.active);		return (link->irq.active);
	}		}
	@@ -726,7 +712,6 @@ static int acpi_pci_link_add(struct acpi_device *device)
	int i = 0;		int i = 0;
	int found = 0;		int found = 0;


	if (!device)		if (!device)
	return -EINVAL;		return -EINVAL;

	@@ -784,10 +769,9 @@ static int acpi_pci_link_add(struct acpi_device *device)

	static int acpi_pci_link_resume(struct acpi_pci_link *link)		static int acpi_pci_link_resume(struct acpi_pci_link *link)
	{		{

	if (link->refcnt && link->irq.active && link->irq.initialized)		if (link->refcnt && link->irq.active && link->irq.initialized)
	return (acpi_pci_link_set(link, link->irq.active));		return (acpi_pci_link_set(link, link->irq.active));
	else
	return 0;		return 0;
	}		}

	@@ -811,7 +795,6 @@ static int acpi_pci_link_remove(struct acpi_device *device, int type)
	{		{
	struct acpi_pci_link *link = NULL;		struct acpi_pci_link *link = NULL;


	if (!device \|\| !acpi_driver_data(device))		if (!device \|\| !acpi_driver_data(device))
	return -EINVAL;		return -EINVAL;

	@@ -822,7 +805,6 @@ static int acpi_pci_link_remove(struct acpi_device *device, int type)
	mutex_unlock(&acpi_link_lock);		mutex_unlock(&acpi_link_lock);

	kfree(link);		kfree(link);

	return 0;		return 0;
	}		}

	@@ -931,7 +913,6 @@ static int __init irqrouter_init_sysfs(void)
	{		{
	int error;		int error;


	if (acpi_disabled \|\| acpi_noirq)		if (acpi_disabled \|\| acpi_noirq)
	return 0;		return 0;