lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1265407106-19937-1-git-send-email-jrh@joshh.co.uk>
Date:	Fri,  5 Feb 2010 21:58:26 +0000
From:	Josh Holland <jrh@...hh.co.uk>
To:	Greg Kroah-Hartman <gregkh@...e.de>,
	Alan Cox <alan@...ux.intel.com>
Cc:	Josh Holland <jrh@...hh.co.uk>,
	André Goddard Rosa <andre.goddard@...il.com>,
	devel@...verdevv.osuosl.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] Staging: rar: More style changes to rar_driver.c

Following advice from Krzysztof Halasa, I made a few changes to the
style bits in rar_driver.c

Signed-off-by: Josh Holland <jrh@...hh.co.uk>
---
 drivers/staging/rar/rar_driver.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rar/rar_driver.c b/drivers/staging/rar/rar_driver.c
index 886a819..a905192 100644
--- a/drivers/staging/rar/rar_driver.c
+++ b/drivers/staging/rar/rar_driver.c
@@ -68,8 +68,7 @@ static void __exit rar_exit_handler(void);
 /*
   function that is activated on the successfull probe of the RAR device
 */
-static int __devinit rar_probe(struct pci_dev *pdev,
-	const struct pci_device_id *ent);
+static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 
 static struct pci_device_id rar_pci_id_tbl[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4110) },
@@ -102,7 +101,7 @@ static int memrar_get_rar_addr(struct pci_dev *pdev, int offset, u32 *addr)
 	 *   2.  [23:16]: Port
 	 *   3.  [15:8]: Register Offset
 	 *   4.  [7:4]: Byte Enables (use 0xF to set all of these bits
-	 *              to 1)
+	 *		to 1)
 	 *   5.  [3:0]: reserved
 	 *
 	 *  Read (0xD0) and write (0xE0) opcodes are written to the
@@ -147,8 +146,7 @@ static int memrar_get_rar_addr(struct pci_dev *pdev, int offset, u32 *addr)
 	/* Send the control message */
 	result = pci_write_config_dword(pdev, LNC_MCR_OFFSET, message);
 
-	printk(KERN_WARNING "rar- result from send ctl register is %x\n",
-			result);
+	printk(KERN_WARNING "rar- result from send ctl register is %x\n", result);
 
 	if (!result)
 		result = pci_read_config_dword(pdev, LNC_MDR_OFFSET, addr);
@@ -180,7 +178,7 @@ static int memrar_set_rar_addr(struct pci_dev *pdev, int offset, u32 addr)
 	 *   2.  [23:16]: Port
 	 *   3.  [15:8]: Register Offset
 	 *   4.  [7:4]: Byte Enables (use 0xF to set all of these bits
-	 *              to 1)
+	 *		to 1)
 	 *   5.  [3:0]: reserved
 	 *
 	 *  Read (0xD0) and write (0xE0) opcodes are written to the
@@ -276,9 +274,8 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
 		return -ENODEV;
 
 	for (i = offsets; i != end; ++i, ++n) {
-		if (memrar_get_rar_addr(pdev, (*i).low, &(rar_addr[n].low))
-			|| memrar_get_rar_addr(pdev, (*i).high,
-			   &(rar_addr[n].high))) {
+		if (memrar_get_rar_addr(pdev, (*i).low, &(rar_addr[n].low)) ||
+		    memrar_get_rar_addr(pdev, (*i).high, &(rar_addr[n].high))) {
 			result = -1;
 			break;
 		}
@@ -289,9 +286,9 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
 
 	if (result == 0) {
 		size_t z;
-		for (z = 0; z != MRST_NUM_RAR; ++z) {
-			printk(KERN_WARNING "rar - "
-			"BRAR[%Zd] physical address low\n"
+		for (z = 0; z != MRST_NUM_RAR; z++) {
+			printk(KERN_WARNING
+			"rar - BRAR[%Zd] physical address low\n"
 			"\tlow:  0x%08x\n"
 			"\thigh: 0x%08x\n",
 			z,
-- 
1.6.3.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ