Merge branch 'pci/yinghai-hotplug-cleanup' into next (7569c43e) · Commits · 戴 / test

drivers/pci/hotplug/acpiphp.h

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -89,8 +89,6 @@ struct acpiphp_bridge {

	/* PCI-to-PCI bridge device */		/* PCI-to-PCI bridge device */
	struct pci_dev *pci_dev;		struct pci_dev *pci_dev;

	spinlock_t res_lock;
	};		};


	@@ -207,6 +205,6 @@ extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);
	extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);		extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);

	/* variables */		/* variables */
	extern int acpiphp_debug;		extern bool acpiphp_debug;

	#endif /* _ACPIPHP_H */		#endif /* _ACPIPHP_H */

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -47,8 +47,7 @@
	/* name size which is used for entries in pcihpfs */		/* name size which is used for entries in pcihpfs */
	#define SLOT_NAME_SIZE 21 /* {_SUN} */		#define SLOT_NAME_SIZE 21 /* {_SUN} */

	static bool debug;		bool acpiphp_debug;
	int acpiphp_debug;

	/* local variables */		/* local variables */
	static int num_slots;		static int num_slots;
	@@ -62,7 +61,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
	MODULE_DESCRIPTION(DRIVER_DESC);		MODULE_DESCRIPTION(DRIVER_DESC);
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
	MODULE_PARM_DESC(debug, "Debugging mode enabled or not");		MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
	module_param(debug, bool, 0644);		module_param_named(debug, acpiphp_debug, bool, 0644);

	/* export the attention callback registration methods */		/* export the attention callback registration methods */
	EXPORT_SYMBOL_GPL(acpiphp_register_attention);		EXPORT_SYMBOL_GPL(acpiphp_register_attention);
	@@ -379,8 +378,6 @@ static int __init acpiphp_init(void)
	if (acpi_pci_disabled)		if (acpi_pci_disabled)
	return 0;		return 0;

	acpiphp_debug = debug;

	/* read all the ACPI info from the system */		/* read all the ACPI info from the system */
	return init_acpi();		return init_acpi();
	}		}

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -396,8 +396,6 @@ static void add_host_bridge(acpi_handle *handle)

	bridge->pci_bus = root->bus;		bridge->pci_bus = root->bus;

	spin_lock_init(&bridge->res_lock);

	init_bridge_misc(bridge);		init_bridge_misc(bridge);
	}		}

	@@ -430,7 +428,6 @@ static void add_p2p_bridge(acpi_handle *handle)
	* (which we access during module unload).		* (which we access during module unload).
	*/		*/
	get_device(&bridge->pci_bus->dev);		get_device(&bridge->pci_bus->dev);
	spin_lock_init(&bridge->res_lock);

	init_bridge_misc(bridge);		init_bridge_misc(bridge);
	return;		return;