Commit 9662e32c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/trivial' into next 

* pci/trivial:
  PCI: shpchp: Constify hpc_ops structure
  PCI: Use kobj_to_dev() instead of open-coding it
  PCI: Use to_pci_dev() instead of open-coding it
  PCI: Fix all whitespace issues
  PCI/MSI: Fix typos in <linux/msi.h>
parents 904f664b bd790082

drivers/pci/hotplug/ibmphp_core.c

+15 −15
Original line number Diff line number Diff line
@@ -1170,7 +1170,7 @@ static int enable_slot(struct hotplug_slot *hs) 
* HOT REMOVING ADAPTER CARD                                   *

* INPUT: POINTER TO THE HOTPLUG SLOT STRUCTURE                *

* OUTPUT: SUCCESS 0 ; FAILURE: UNCONFIGURE , VALIDATE         *

          DISABLE POWER ,                                    *

*		DISABLE POWER ,                               *

**************************************************************/

static int ibmphp_disable_slot(struct hotplug_slot *hotplug_slot)

{

drivers/pci/hotplug/shpchp.h

+7 −7
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct slot { 
	u8 presence_save;

	u8 pwr_save;

	struct controller *ctrl;

	struct hpc_ops *hpc_ops;

	const struct hpc_ops *hpc_ops;

	struct hotplug_slot *hotplug_slot;

	struct list_head	slot_list;

	struct delayed_work work;	/* work for button event */
@@ -106,7 +106,7 @@ struct controller { 
	int slot_num_inc;		/* 1 or -1 */

	struct pci_dev *pci_dev;

	struct list_head slot_list;

	struct hpc_ops *hpc_ops;

	const struct hpc_ops *hpc_ops;

	wait_queue_head_t queue;	/* sleep & wake process */

	u8 slot_device_offset;

	u32 pcix_misc2_reg;	/* for amd pogo errata */

drivers/pci/hotplug/shpchp_hpc.c

+2 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ static int shpc_get_max_bus_speed(struct controller *ctrl) 
	return retval;

}



static struct hpc_ops shpchp_hpc_ops = {

static const struct hpc_ops shpchp_hpc_ops = {

	.power_on_slot			= hpc_power_on_slot,

	.slot_enable			= hpc_slot_enable,

	.slot_disable			= hpc_slot_disable,

drivers/pci/hotplug/shpchp_sysfs.c

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha 
	struct resource *res;

	struct pci_bus *bus;



	pdev = container_of (dev, struct pci_dev, dev);

	pdev = to_pci_dev(dev);

	bus = pdev->subordinate;



	out += sprintf(buf, "Free resources: memory\n");

drivers/pci/pci-label.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static umode_t smbios_instance_string_exist(struct kobject *kobj, 
	struct device *dev;

	struct pci_dev *pdev;



	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);

	pdev = to_pci_dev(dev);



	return find_smbios_instance_string(pdev, NULL, SMBIOS_ATTR_NONE) ?
@@ -221,7 +221,7 @@ static umode_t acpi_index_string_exist(struct kobject *kobj, 
{

	struct device *dev;



	dev = container_of(kobj, struct device, kobj);

	dev = kobj_to_dev(kobj);



	if (device_has_dsm(dev))

		return S_IRUGO;