Skip to contentSkip to conversation

patch series

PATCH New Ryan Desfosses 1 participant 9 messages Apr 19, 2014 PCI

lore
Share & tools
lore

Ryan Desfosses

author
#0 lore raw

cover patch series

There are eight patches in this series. All changes are trivial with no dependencies or required order.

author
#1 lore raw

PATCH 1/8 ats: removed parentheses after return

change made to resolve following checkpatch message:
ERROR: return is not a function, parentheses are not required
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/ats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/ats.c +1 -1
index a8099d4..d653182 100644
@@ -369,7 +369,7 @@ int pci_max_pasids(struct pci_dev *pdev)
 
 	supported = (supported & PASID_NUMBER_MASK) >> PASID_NUMBER_SHIFT;
 
-	return (1 << supported);
+	return 1 << supported;
 }
 EXPORT_SYMBOL_GPL(pci_max_pasids);
 #endif /* CONFIG_PCI_PASID */
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/8 bus: moved EXPORT_SYMBOL so that it immediately followed its function/variable

In reply to Ryan Desfosses

change made to resolve following checkpatch message:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/bus.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/bus.c +3 -3
index fb8aed3..2164d29 100644
@@ -227,6 +227,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) { }
 

@@ -256,6 +257,7 @@ int pci_bus_add_device(struct pci_dev *dev)
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(pci_bus_add_device);
 
 /**
  * pci_bus_add_devices - start driver for PCI devices

@@ -286,6 +288,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

@@ -351,6 +354,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);
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 3/8 htirq: moved EXPORT_SYMBOL so that it immediately followed its function/variable

In reply to Ryan Desfosses

change made to resolve following checkpatch message:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/htirq.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/htirq.c +3 -3
index 6e373ea..776c2ef 100644
@@ -136,6 +136,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
 
 	return irq;
 }
+EXPORT_SYMBOL(__ht_create_irq);
 
 /**
  * ht_create_irq - create an irq and attach it to a device.

@@ -151,6 +152,7 @@ int ht_create_irq(struct pci_dev *dev, int idx)
 {
 	return __ht_create_irq(dev, idx, NULL);
 }
+EXPORT_SYMBOL(ht_create_irq);
 
 /**
  * ht_destroy_irq - destroy an irq created with ht_create_irq

@@ -170,7 +172,5 @@ void ht_destroy_irq(unsigned int irq)
 
 	kfree(cfg);
 }
-
-EXPORT_SYMBOL(__ht_create_irq);
-EXPORT_SYMBOL(ht_create_irq);
 EXPORT_SYMBOL(ht_destroy_irq);
+
Signature · 1 line
1.9.1
author
#4 lore raw

PATCH 4/8 htirq: removed space after open parenthesis

In reply to Ryan Desfosses

change made to resolve following checkpatch message:
ERROR: space prohibited after that open parenthesis '('
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/htirq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/htirq.c +1 -1
index 776c2ef..40862e6 100644
@@ -105,7 +105,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
 	spin_unlock_irqrestore(&ht_irq_lock, flags);
 
 	max_irq = (data >> 16) & 0xff;
-	if ( idx > max_irq)
+	if (idx > max_irq)
 		return -EINVAL;
 
 	cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
Signature · 1 line
1.9.1
author
#5 lore raw

PATCH 5/8 msi: merged quoted strings

In reply to Ryan Desfosses

change made to resolve following checkpatch message:
WARNING: quoted string split across lines
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/msi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/msi.c +2 -4
index 955ab79..31ae0bb 100644
@@ -917,8 +917,7 @@ int pci_enable_msi_block(struct pci_dev *dev, int nvec)
 
 	/* Check whether driver already requested MSI-X irqs */
 	if (dev->msix_enabled) {
-		dev_info(&dev->dev, "can't enable MSI "
-			 "(MSI-X already enabled)\n");
+		dev_info(&dev->dev, "can't enable MSI (MSI-X already enabled)\n");
 		return -EINVAL;
 	}
 

@@ -1029,8 +1028,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
 
 	/* Check whether driver already requested for MSI irq */
 	if (dev->msi_enabled) {
-		dev_info(&dev->dev, "can't enable MSI-X "
-		       "(MSI IRQ already assigned)\n");
+		dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n");
 		return -EINVAL;
 	}
 	status = msix_capability_init(dev, entries, nvec);
Signature · 1 line
1.9.1
author
#6 lore raw

PATCH 6/8 pci-driver: added or removed a space to resolve checkpatch messages

In reply to Ryan Desfosses

changes made to resolve following messages:
ERROR: spaces required around that '=' (ctx:VxV)
ERROR: "foo * bar" should be "foo *bar"
ERROR: spaces required around that '<=' (ctx:VxV)
ERROR: space required before the open parenthesis '('
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/pci-driver.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/pci/pci-driver.c +17 -17
index d911e0c..821efe2 100644
@@ -103,10 +103,10 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
 {
 	struct pci_driver *pdrv = to_pci_driver(driver);
 	const struct pci_device_id *ids = pdrv->id_table;
-	__u32 vendor, device, subvendor=PCI_ANY_ID,
-		subdevice=PCI_ANY_ID, class=0, class_mask=0;
-	unsigned long driver_data=0;
-	int fields=0;
+	__u32 vendor, device, subvendor = PCI_ANY_ID,
+		subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
+	unsigned long driver_data = 0;
+	int fields = 0;
 	int retval;
 
 	fields = sscanf(buf, "%x %x %x %x %x %x %lx",

@@ -351,7 +351,7 @@ __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
 	return error;
 }
 
-static int pci_device_probe(struct device * dev)
+static int pci_device_probe(struct device *dev)
 {
 	int error = 0;
 	struct pci_driver *drv;

@@ -367,10 +367,10 @@ static int pci_device_probe(struct device * dev)
 	return error;
 }
 
-static int pci_device_remove(struct device * dev)
+static int pci_device_remove(struct device *dev)
 {
-	struct pci_dev * pci_dev = to_pci_dev(dev);
-	struct pci_driver * drv = pci_dev->driver;
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *drv = pci_dev->driver;
 
 	if (drv) {
 		if (drv->remove) {

@@ -498,8 +498,8 @@ static int pci_pm_reenable_device(struct pci_dev *pci_dev)
 
 static int pci_legacy_suspend(struct device *dev, pm_message_t state)
 {
-	struct pci_dev * pci_dev = to_pci_dev(dev);
-	struct pci_driver * drv = pci_dev->driver;
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *drv = pci_dev->driver;
 
 	if (drv && drv->suspend) {
 		pci_power_t prev = pci_dev->current_state;

@@ -525,8 +525,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
 
 static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
 {
-	struct pci_dev * pci_dev = to_pci_dev(dev);
-	struct pci_driver * drv = pci_dev->driver;
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *drv = pci_dev->driver;
 
 	if (drv && drv->suspend_late) {
 		pci_power_t prev = pci_dev->current_state;

@@ -556,8 +556,8 @@ static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
 
 static int pci_legacy_resume_early(struct device *dev)
 {
-	struct pci_dev * pci_dev = to_pci_dev(dev);
-	struct pci_driver * drv = pci_dev->driver;
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *drv = pci_dev->driver;
 
 	return drv && drv->resume_early ?
 			drv->resume_early(pci_dev) : 0;

@@ -565,8 +565,8 @@ static int pci_legacy_resume_early(struct device *dev)
 
 static int pci_legacy_resume(struct device *dev)
 {
-	struct pci_dev * pci_dev = to_pci_dev(dev);
-	struct pci_driver * drv = pci_dev->driver;
+	struct pci_dev *pci_dev = to_pci_dev(dev);
+	struct pci_driver *drv = pci_dev->driver;
 
 	pci_fixup_device(pci_fixup_resume, pci_dev);
 

@@ -1252,7 +1252,7 @@ pci_dev_driver(const struct pci_dev *dev)
 		return dev->driver;
 	else {
 		int i;
-		for(i=0; i<=PCI_ROM_RESOURCE; i++)
+		for (i = 0; i <= PCI_ROM_RESOURCE; i++)
 			if (dev->resource[i].flags & IORESOURCE_BUSY)
 				return &pci_compat_driver;
 	}
Signature · 1 line
1.9.1
author
#7 lore raw

PATCH 7/8 pci-driver: moved EXPORT_SYMBOL so that it immediately followed its function/variable

In reply to Ryan Desfosses

change made to resolve following checkpatch message:
WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/aariable
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/pci-driver.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/pci/pci-driver.c +8 -8
index 821efe2..2c921a2 100644
@@ -77,6 +77,7 @@ int pci_add_dynid(struct pci_driver *drv,
 
 	return retval;
 }
+EXPORT_SYMBOL_GPL(pci_add_dynid);
 
 static void pci_free_dynids(struct pci_driver *drv)
 {

@@ -242,6 +243,7 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
 
 	return pci_match_id(drv->id_table, dev);
 }
+EXPORT_SYMBOL(pci_match_id);
 
 struct drv_dev_and_id {
 	struct pci_driver *drv;

@@ -1216,6 +1218,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
 	/* register with core */
 	return driver_register(&drv->driver);
 }
+EXPORT_SYMBOL(__pci_register_driver);
 
 /**
  * pci_unregister_driver - unregister a pci driver

@@ -1233,6 +1236,7 @@ pci_unregister_driver(struct pci_driver *drv)
 	driver_unregister(&drv->driver);
 	pci_free_dynids(drv);
 }
+EXPORT_SYMBOL(pci_unregister_driver);
 
 static struct pci_driver pci_compat_driver = {
 	.name = "compat"

@@ -1258,6 +1262,7 @@ pci_dev_driver(const struct pci_dev *dev)
 	}
 	return NULL;
 }
+EXPORT_SYMBOL(pci_dev_driver);
 
 /**
  * pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure

@@ -1303,6 +1308,7 @@ struct pci_dev *pci_dev_get(struct pci_dev *dev)
 		get_device(&dev->dev);
 	return dev;
 }
+EXPORT_SYMBOL(pci_dev_get);
 
 /**
  * pci_dev_put - release a use of the pci device structure

@@ -1316,6 +1322,7 @@ void pci_dev_put(struct pci_dev *dev)
 	if (dev)
 		put_device(&dev->dev);
 }
+EXPORT_SYMBOL(pci_dev_put);
 
 static int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
 {

@@ -1362,6 +1369,7 @@ struct bus_type pci_bus_type = {
 	.drv_groups	= pci_drv_groups,
 	.pm		= PCI_PM_OPS_PTR,
 };
+EXPORT_SYMBOL(pci_bus_type);
 
 static int __init pci_driver_init(void)
 {

@@ -1370,11 +1378,3 @@ static int __init pci_driver_init(void)
 
 postcore_initcall(pci_driver_init);
 
-EXPORT_SYMBOL_GPL(pci_add_dynid);
-EXPORT_SYMBOL(pci_match_id);
-EXPORT_SYMBOL(__pci_register_driver);
-EXPORT_SYMBOL(pci_unregister_driver);
-EXPORT_SYMBOL(pci_dev_driver);
-EXPORT_SYMBOL(pci_bus_type);
-EXPORT_SYMBOL(pci_dev_get);
-EXPORT_SYMBOL(pci_dev_put);
Signature · 1 line
1.9.1
author
#8 lore raw

PATCH 8/8 pci-stub: added spaces around equal sign

In reply to Ryan Desfosses

change made to resolve following checkpatch message
ERROR: spaces required around that '=' (ctx:VxV)
branch: Linux 3.15-rc1

Signed-off-by Ryan Desfosses <[email protected]>
---
 drivers/pci/pci-stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci-stub.c +1 -1
index 2ff7750..886fb35 100644
@@ -55,7 +55,7 @@ static int __init pci_stub_init(void)
 	p = ids;
 	while ((id = strsep(&p, ","))) {
 		unsigned int vendor, device, subvendor = PCI_ANY_ID,
-			subdevice = PCI_ANY_ID, class=0, class_mask=0;
+			subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
 		int fields;
 
 		if (!strlen(id))
Signature · 1 line
1.9.1