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

Commit b7fe9434 authored by Ryan Desfosses's avatar Ryan Desfosses Committed by Bjorn Helgaas
Browse files

PCI: Move EXPORT_SYMBOL so it immediately follows function/variable 



Move EXPORT_SYMBOL so it immediately follows the function or variable.

No functional change.

[bhelgaas: squash similar changes, fix hotplug, probe, rom, search, too]
Signed-off-by: default avatarRyan Desfosses <ryan@desfo.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 843a85ce

drivers/pci/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 
					 type_mask, alignf, alignf_data,

					 &pci_32_bit);

}

EXPORT_SYMBOL(pci_bus_alloc_resource);



void __weak pcibios_resource_survey_bus(struct pci_bus *bus) { }
@@ -253,6 +254,7 @@ void pci_bus_add_device(struct pci_dev *dev) 


	dev->is_added = 1;

}

EXPORT_SYMBOL_GPL(pci_bus_add_device);



/**

 * pci_bus_add_devices - start driver for PCI devices
@@ -279,6 +281,7 @@ void pci_bus_add_devices(const struct pci_bus *bus) 
			pci_bus_add_devices(child);

	}

}

EXPORT_SYMBOL(pci_bus_add_devices);



/** pci_walk_bus - walk devices on/under bus, calling callback.

 *  @top      bus whose devices should be walked
@@ -344,6 +347,3 @@ void pci_bus_put(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pci_bus_put);

EXPORT_SYMBOL(pci_bus_alloc_resource);

EXPORT_SYMBOL_GPL(pci_bus_add_device);

EXPORT_SYMBOL(pci_bus_add_devices);

drivers/pci/hotplug/acpiphp_core.c

+2 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ MODULE_LICENSE("GPL"); 
MODULE_PARM_DESC(disable, "disable acpiphp driver");

module_param_named(disable, acpiphp_disabled, bool, 0444);



/* export the attention callback registration methods */

EXPORT_SYMBOL_GPL(acpiphp_register_attention);

EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);



static int enable_slot		(struct hotplug_slot *slot);

static int disable_slot		(struct hotplug_slot *slot);

static int set_attention_status (struct hotplug_slot *slot, u8 value);
@@ -104,6 +100,7 @@ int acpiphp_register_attention(struct acpiphp_attention_info *info) 
	}

	return retval;

}

EXPORT_SYMBOL_GPL(acpiphp_register_attention);





/**
@@ -124,6 +121,7 @@ int acpiphp_unregister_attention(struct acpiphp_attention_info *info) 
	}

	return retval;

}

EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);





/**

drivers/pci/hotplug/cpci_hotplug_core.c

+6 −7
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ error_slot: 
error:

	return status;

}

EXPORT_SYMBOL_GPL(cpci_hp_register_bus);



int

cpci_hp_unregister_bus(struct pci_bus *bus)
@@ -329,6 +330,7 @@ cpci_hp_unregister_bus(struct pci_bus *bus) 
	up_write(&list_rwsem);

	return status;

}

EXPORT_SYMBOL_GPL(cpci_hp_unregister_bus);



/* This is the interrupt mode interrupt handler */

static irqreturn_t
@@ -614,6 +616,7 @@ cpci_hp_register_controller(struct cpci_hp_controller *new_controller) 
		controller = new_controller;

	return status;

}

EXPORT_SYMBOL_GPL(cpci_hp_register_controller);



static void

cleanup_slots(void)
@@ -653,6 +656,7 @@ cpci_hp_unregister_controller(struct cpci_hp_controller *old_controller) 
		status = -ENODEV;

	return status;

}

EXPORT_SYMBOL_GPL(cpci_hp_unregister_controller);



int

cpci_hp_start(void)
@@ -690,6 +694,7 @@ cpci_hp_start(void) 
	dbg("%s - exit", __func__);

	return 0;

}

EXPORT_SYMBOL_GPL(cpci_hp_start);



int

cpci_hp_stop(void)
@@ -704,6 +709,7 @@ cpci_hp_stop(void) 
	cpci_stop_thread();

	return 0;

}

EXPORT_SYMBOL_GPL(cpci_hp_stop);



int __init

cpci_hotplug_init(int debug)
@@ -721,10 +727,3 @@ cpci_hotplug_exit(void) 
	cpci_hp_stop();

	cpci_hp_unregister_controller(controller);

}
 


EXPORT_SYMBOL_GPL(cpci_hp_register_controller);

EXPORT_SYMBOL_GPL(cpci_hp_unregister_controller);

EXPORT_SYMBOL_GPL(cpci_hp_register_bus);

EXPORT_SYMBOL_GPL(cpci_hp_unregister_bus);

EXPORT_SYMBOL_GPL(cpci_hp_start);

EXPORT_SYMBOL_GPL(cpci_hp_stop);

drivers/pci/hotplug/pci_hotplug_core.c

+3 −4
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ out: 
	mutex_unlock(&pci_hp_mutex);

	return result;

}

EXPORT_SYMBOL_GPL(__pci_hp_register);



/**

 * pci_hp_deregister - deregister a hotplug_slot with the PCI hotplug subsystem
@@ -506,6 +507,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug) 


	return 0;

}

EXPORT_SYMBOL_GPL(pci_hp_deregister);



/**

 * pci_hp_change_slot_info - changes the slot's information structure in the core
@@ -527,6 +529,7 @@ int pci_hp_change_slot_info(struct hotplug_slot *hotplug, 


	return 0;

}

EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);



static int __init pci_hotplug_init (void)

{
@@ -557,7 +560,3 @@ MODULE_DESCRIPTION(DRIVER_DESC); 
MODULE_LICENSE("GPL");

module_param(debug, bool, 0644);

MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
 


EXPORT_SYMBOL_GPL(__pci_hp_register);

EXPORT_SYMBOL_GPL(pci_hp_deregister);

EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);

drivers/pci/hotplug/rpaphp_core.c

+3 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


bool rpaphp_debug;

LIST_HEAD(rpaphp_slot_head);

EXPORT_SYMBOL_GPL(rpaphp_slot_head);



#define DRIVER_VERSION	"0.1"

#define DRIVER_AUTHOR	"Linda Xie <lxie@us.ibm.com>"
@@ -241,6 +242,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index, 


	return -EINVAL;

}

EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);



static int is_php_type(char *drc_type)

{
@@ -350,6 +352,7 @@ int rpaphp_add_slot(struct device_node *dn) 
	/* XXX FIXME: reports a failure only if last entry in loop failed */

	return retval;

}

EXPORT_SYMBOL_GPL(rpaphp_add_slot);



static void __exit cleanup_slots(void)

{
@@ -443,7 +446,3 @@ struct hotplug_slot_ops rpaphp_hotplug_slot_ops = { 


module_init(rpaphp_init);

module_exit(rpaphp_exit);
 


EXPORT_SYMBOL_GPL(rpaphp_add_slot);

EXPORT_SYMBOL_GPL(rpaphp_slot_head);

EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);