[Ltp-commits] [Git] ltp updated.

[Cyril H. <su...@li...>]

The branch, master, has been updated
       via  b3c1c0fc2373b27227f268c88945ead56eedb067 (commit)
      from  8bec5d12646894cf29be8231ef5cb54fa468e22f (commit)


- Log -----------------------------------------------------------------
commit b3c1c0fc2373b27227f268c88945ead56eedb067
Author: Alexey Kodanev <ale...@or...>
Date:   Tue Oct 29 18:04:30 2013 +0400

    device-drivers: pci: check memory region for flag IORESOURCE_PREFETCH
    
    This is done to make sure there will be no side effects if we change it somehow
    in the test (e.g. we're not changing I/O ports implemented as memory regions).
    Remove annoying printk messages.
    
    Signed-off-by: Alexey Kodanev <ale...@or...>
    Reviewed-by: Wanlong Gao <gao...@cn...>

-----------------------------------------------------------------------

Summary of changes:
 .../device-drivers/pci/tpci_kernel/ltp_tpci.c      |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
 
diff --git a/testcases/kernel/device-drivers/pci/tpci_kernel/ltp_tpci.c b/testcases/kernel/device-drivers/pci/tpci_kernel/ltp_tpci.c
index 4e92f5e..d2ffacd 100644
--- a/testcases/kernel/device-drivers/pci/tpci_kernel/ltp_tpci.c
+++ b/testcases/kernel/device-drivers/pci/tpci_kernel/ltp_tpci.c
@@ -99,8 +99,6 @@ static int probe_pci_dev(unsigned int bus, unsigned int slot)
 {
 	struct pci_dev *dev;
 
-	prk_info("find arbitrary pci device for test");
-
 	if (ltp_pci.dev) {
 		pci_dev_put(ltp_pci.dev);
 		ltp_pci.dev = NULL;
@@ -467,7 +465,8 @@ static int test_assign_resources(void)
 			r->name, r->flags,
 			(unsigned long)r->start, (unsigned long)r->end);
 
-		if ((r->flags & IORESOURCE_MEM) == IORESOURCE_MEM) {
+		if (r->flags & IORESOURCE_MEM &&
+			r->flags & IORESOURCE_PREFETCH) {
 			ret = pci_assign_resource(dev, i);
 			prk_info("assign resource to '%d', ret '%d'", i, ret);
 			rc |= (ret < 0 && ret != -EBUSY) ? TFAIL : TPASS;
@@ -718,8 +717,6 @@ static ssize_t sys_bus_slot(struct device *dev,
 	bus = res >> 8 & 0xFF;
 	slot = res & 0xFF;
 
-	prk_info("get bus '%u' slot '%u'", bus, slot);
-
 	ret = probe_pci_dev(bus, slot);
 	if (ret)
 		return ret;


hooks/post-receive
-- 
ltp