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

Commit 656f978f authored by Quentin Lambert's avatar Quentin Lambert Committed by Bjorn Helgaas
Browse files

PCI: Remove unnecessary curly braces 



Remove curly braces in simple "if" cases.

No functional change.

Signed-off-by: default avatarQuentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 382a9c9a

drivers/pci/hotplug/cpci_hotplug_core.c

+2 −2
Original line number Diff line number Diff line
@@ -467,9 +467,9 @@ check_slots(void) 
			    __func__, slot_name(slot), hs_csr);



			if (!slot->extracting) {

				if (update_latch_status(slot->hotplug_slot, 0)) {

				if (update_latch_status(slot->hotplug_slot, 0))

					warn("failure to update latch file");

				}



				slot->extracting = 1;

				atomic_inc(&extracting);

			}

drivers/pci/hotplug/cpcihp_zt5550.c

+5 −6
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ static int zt5550_hc_enable_irq(void) 
{

	u8 reg;



	if (hc_dev == NULL) {

	if (hc_dev == NULL)

		return -ENODEV;

	}



	reg = readb(csr_int_mask);

	reg = reg & ~ENUM_INT_MASK;

	writeb(reg, csr_int_mask);
@@ -195,9 +195,8 @@ static int zt5550_hc_disable_irq(void) 
{

	u8 reg;



	if (hc_dev == NULL) {

	if (hc_dev == NULL)

		return -ENODEV;

	}



	reg = readb(csr_int_mask);

	reg = reg | ENUM_INT_MASK;
@@ -210,9 +209,9 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id 
	int status;



	status = zt5550_hc_config(pdev);

	if (status != 0) {

	if (status != 0)

		return status;

	}



	dbg("returned from zt5550_hc_config");



	memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));

drivers/pci/hotplug/cpqphp_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1096,9 +1096,8 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* initialize our threads if they haven't already been started up */

	rc = one_time_init();

	if (rc) {

	if (rc)

		goto err_free_bus;

	}



	dbg("pdev = %p\n", pdev);

	dbg("pci resource start %llx\n", (unsigned long long)pci_resource_start(pdev, 0));

drivers/pci/hotplug/cpqphp_ctrl.c

+5 −10
Original line number Diff line number Diff line
@@ -705,9 +705,8 @@ static struct pci_resource *get_max_resource(struct pci_resource **head, u32 siz 
		if (temp == max) {

			*head = max->next;

		} else {

			while (temp && temp->next != max) {

			while (temp && temp->next != max)

				temp = temp->next;

			}



			if (temp)

				temp->next = max->next;
@@ -903,9 +902,8 @@ irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data) 
	/*

	 * Check to see if it was our interrupt

	 */

	if (!(misc & 0x000C)) {

	if (!(misc & 0x000C))

		return IRQ_NONE;

	}



	if (misc & 0x0004) {

		/*
@@ -2006,9 +2004,8 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func) 
	/* Check to see if the interlock is closed */

	tempdword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR);



	if (tempdword & (0x01 << hp_slot)) {

	if (tempdword & (0x01 << hp_slot))

		return 1;

	}



	if (func->is_a_board) {

		rc = board_replaced(func, ctrl);
@@ -2070,9 +2067,8 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func) 
		}

	}



	if (rc) {

	if (rc)

		dbg("%s: rc = %d\n", __func__, rc);

	}



	if (p_slot)

		update_slot_info(ctrl, p_slot);
@@ -2095,9 +2091,8 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func) 
	device = func->device;

	func = cpqhp_slot_find(ctrl->bus, device, index++);

	p_slot = cpqhp_find_slot(ctrl, device);

	if (p_slot) {

	if (p_slot)

		physical_slot = p_slot->number;

	}



	/* Make sure there are no video controllers here */

	while (func && !rc) {

drivers/pci/hotplug/cpqphp_nvram.c

+5 −8
Original line number Diff line number Diff line
@@ -204,9 +204,8 @@ static int load_HRT (void __iomem *rom_start) 
	u8 temp_byte = 0xFF;

	u32 rc;



	if (!check_for_compaq_ROM(rom_start)) {

	if (!check_for_compaq_ROM(rom_start))

		return -ENODEV;

	}



	available = 1024;
@@ -250,9 +249,8 @@ static u32 store_HRT (void __iomem *rom_start) 


	available = 1024;



	if (!check_for_compaq_ROM(rom_start)) {

	if (!check_for_compaq_ROM(rom_start))

		return(1);

	}



	buffer = (u32*) evbuffer;
@@ -427,9 +425,9 @@ static u32 store_HRT (void __iomem *rom_start) 


void compaq_nvram_init (void __iomem *rom_start)

{

	if (rom_start) {

	if (rom_start)

		compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);

	}



	dbg("int15 entry  = %p\n", compaq_int15_entry_point);



	/* initialize our int15 lock */
@@ -661,10 +659,9 @@ int compaq_nvram_store (void __iomem *rom_start) 


	if (evbuffer_init) {

		rc = store_HRT(rom_start);

		if (rc) {

		if (rc)

			err(msg_unable_to_save);

	}

	}

	return rc;

}