public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Andy Shevchenko <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com,
	tglx@linutronix.de, david.e.box@linux.intel.com,
	mingo@kernel.org, hpa@zytor.com
Subject: [tip:x86/platform] x86/platform/iosf_mbi: Source cleanup
Date: Thu, 16 Jul 2015 08:53:29 -0700	[thread overview]
Message-ID: <tip-7e1ff15b699bcb2bce1e8086323d227788960044@git.kernel.org> (raw)
In-Reply-To: <1436366709-17683-5-git-send-email-andriy.shevchenko@linux.intel.com>

Commit-ID:  7e1ff15b699bcb2bce1e8086323d227788960044
Gitweb:     http://git.kernel.org/tip/7e1ff15b699bcb2bce1e8086323d227788960044
Author:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Wed, 8 Jul 2015 17:45:08 +0300
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 16 Jul 2015 17:48:48 +0200

x86/platform/iosf_mbi: Source cleanup

 - Move the static variables to one place
 - Fix indentations in the header
 - Correct comments

No functional change.

[ tglx: Massaged changelog ]

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: David E . Box <david.e.box@linux.intel.com>
Link: http://lkml.kernel.org/r/1436366709-17683-5-git-send-email-andriy.shevchenko@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/include/asm/iosf_mbi.h    | 8 ++++----
 arch/x86/platform/intel/iosf_mbi.c | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/iosf_mbi.h b/arch/x86/include/asm/iosf_mbi.h
index 57995f0..b72ad0f 100644
--- a/arch/x86/include/asm/iosf_mbi.h
+++ b/arch/x86/include/asm/iosf_mbi.h
@@ -52,20 +52,20 @@
 
 /* Quark available units */
 #define QRK_MBI_UNIT_HBA	0x00
-#define QRK_MBI_UNIT_HB	0x03
+#define QRK_MBI_UNIT_HB		0x03
 #define QRK_MBI_UNIT_RMU	0x04
-#define QRK_MBI_UNIT_MM	0x05
+#define QRK_MBI_UNIT_MM		0x05
 #define QRK_MBI_UNIT_MMESRAM	0x05
 #define QRK_MBI_UNIT_SOC	0x31
 
 /* Quark read/write opcodes */
 #define QRK_MBI_HBA_READ	0x10
 #define QRK_MBI_HBA_WRITE	0x11
-#define QRK_MBI_HB_READ	0x10
+#define QRK_MBI_HB_READ		0x10
 #define QRK_MBI_HB_WRITE	0x11
 #define QRK_MBI_RMU_READ	0x10
 #define QRK_MBI_RMU_WRITE	0x11
-#define QRK_MBI_MM_READ	0x10
+#define QRK_MBI_MM_READ		0x10
 #define QRK_MBI_MM_WRITE	0x11
 #define QRK_MBI_MMESRAM_READ	0x12
 #define QRK_MBI_MMESRAM_WRITE	0x13
diff --git a/arch/x86/platform/intel/iosf_mbi.c b/arch/x86/platform/intel/iosf_mbi.c
index 0b33105..28fb290 100644
--- a/arch/x86/platform/intel/iosf_mbi.c
+++ b/arch/x86/platform/intel/iosf_mbi.c
@@ -31,6 +31,7 @@
 #define PCI_DEVICE_ID_BRASWELL		0x2280
 #define PCI_DEVICE_ID_QUARK_X1000	0x0958
 
+static struct pci_dev *mbi_pdev;
 static DEFINE_SPINLOCK(iosf_mbi_lock);
 
 static inline u32 iosf_mbi_form_mcr(u8 op, u8 port, u8 offset)
@@ -38,8 +39,6 @@ static inline u32 iosf_mbi_form_mcr(u8 op, u8 port, u8 offset)
 	return (op << 24) | (port << 16) | (offset << 8) | MBI_ENABLE;
 }
 
-static struct pci_dev *mbi_pdev;	/* one mbi device */
-
 static int iosf_mbi_pci_read_mdr(u32 mcrx, u32 mcr, u32 *mdr)
 {
 	int result;
@@ -104,7 +103,7 @@ int iosf_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr)
 	unsigned long flags;
 	int ret;
 
-	/*Access to the GFX unit is handled by GPU code */
+	/* Access to the GFX unit is handled by GPU code */
 	if (port == BT_MBI_UNIT_GFX) {
 		WARN_ON(1);
 		return -EPERM;
@@ -127,7 +126,7 @@ int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr)
 	unsigned long flags;
 	int ret;
 
-	/*Access to the GFX unit is handled by GPU code */
+	/* Access to the GFX unit is handled by GPU code */
 	if (port == BT_MBI_UNIT_GFX) {
 		WARN_ON(1);
 		return -EPERM;
@@ -151,7 +150,7 @@ int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask)
 	unsigned long flags;
 	int ret;
 
-	/*Access to the GFX unit is handled by GPU code */
+	/* Access to the GFX unit is handled by GPU code */
 	if (port == BT_MBI_UNIT_GFX) {
 		WARN_ON(1);
 		return -EPERM;

  reply	other threads:[~2015-07-16 15:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-08 14:45 [PATCH v2 0/5] x86/platform/iosf_mbi: fix and clean up Andy Shevchenko
2015-07-08 14:45 ` [PATCH v2 1/5] x86/platform/iosf_mbi: move to dedicated folder Andy Shevchenko
2015-07-16 15:52   ` [tip:x86/platform] x86/platform/iosf_mbi: Move " tip-bot for Andy Shevchenko
2015-07-08 14:45 ` [PATCH v2 2/5] x86/platform/iosf_mbi: check result for all calls of debugfs API Andy Shevchenko
2015-07-16 15:52   ` [tip:x86/platform] x86/platform/iosf_mbi: Check return value of debugfs_create properly tip-bot for Andy Shevchenko
2015-07-08 14:45 ` [PATCH v2 3/5] x86/platform/iosf_mbi: pci_dev_put() is NULL-proof Andy Shevchenko
2015-07-16 15:53   ` [tip:x86/platform] x86/platform/iosf_mbi: Remove NULL pointer checks for pci_dev_put() tip-bot for Andy Shevchenko
2015-07-08 14:45 ` [PATCH v2 4/5] x86/platform/iosf_mbi: group global variables Andy Shevchenko
2015-07-16 15:53   ` tip-bot for Andy Shevchenko [this message]
2015-07-08 14:45 ` [PATCH v2 5/5] x86/platform/iosf_mbi: append Intel Tangier ID Andy Shevchenko
2015-07-16 15:42   ` Thomas Gleixner
2015-07-16 15:53   ` [tip:x86/platform] x86/platform/iosf_mbi: Add Intel Tangier PCI id tip-bot for Andy Shevchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-7e1ff15b699bcb2bce1e8086323d227788960044@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox