tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Andy Shevchenko and committed by
Thomas Gleixner 7e1ff15b b93fb9f6

+8 -9
+4 -4
arch/x86/include/asm/iosf_mbi.h
··· 52 52 53 53 /* Quark available units */ 54 54 #define QRK_MBI_UNIT_HBA 0x00 55 - #define QRK_MBI_UNIT_HB 0x03 55 + #define QRK_MBI_UNIT_HB 0x03 56 56 #define QRK_MBI_UNIT_RMU 0x04 57 - #define QRK_MBI_UNIT_MM 0x05 57 + #define QRK_MBI_UNIT_MM 0x05 58 58 #define QRK_MBI_UNIT_MMESRAM 0x05 59 59 #define QRK_MBI_UNIT_SOC 0x31 60 60 61 61 /* Quark read/write opcodes */ 62 62 #define QRK_MBI_HBA_READ 0x10 63 63 #define QRK_MBI_HBA_WRITE 0x11 64 - #define QRK_MBI_HB_READ 0x10 64 + #define QRK_MBI_HB_READ 0x10 65 65 #define QRK_MBI_HB_WRITE 0x11 66 66 #define QRK_MBI_RMU_READ 0x10 67 67 #define QRK_MBI_RMU_WRITE 0x11 68 - #define QRK_MBI_MM_READ 0x10 68 + #define QRK_MBI_MM_READ 0x10 69 69 #define QRK_MBI_MM_WRITE 0x11 70 70 #define QRK_MBI_MMESRAM_READ 0x12 71 71 #define QRK_MBI_MMESRAM_WRITE 0x13
+4 -5
arch/x86/platform/intel/iosf_mbi.c
··· 31 31 #define PCI_DEVICE_ID_BRASWELL 0x2280 32 32 #define PCI_DEVICE_ID_QUARK_X1000 0x0958 33 33 34 + static struct pci_dev *mbi_pdev; 34 35 static DEFINE_SPINLOCK(iosf_mbi_lock); 35 36 36 37 static inline u32 iosf_mbi_form_mcr(u8 op, u8 port, u8 offset) 37 38 { 38 39 return (op << 24) | (port << 16) | (offset << 8) | MBI_ENABLE; 39 40 } 40 - 41 - static struct pci_dev *mbi_pdev; /* one mbi device */ 42 41 43 42 static int iosf_mbi_pci_read_mdr(u32 mcrx, u32 mcr, u32 *mdr) 44 43 { ··· 103 104 unsigned long flags; 104 105 int ret; 105 106 106 - /*Access to the GFX unit is handled by GPU code */ 107 + /* Access to the GFX unit is handled by GPU code */ 107 108 if (port == BT_MBI_UNIT_GFX) { 108 109 WARN_ON(1); 109 110 return -EPERM; ··· 126 127 unsigned long flags; 127 128 int ret; 128 129 129 - /*Access to the GFX unit is handled by GPU code */ 130 + /* Access to the GFX unit is handled by GPU code */ 130 131 if (port == BT_MBI_UNIT_GFX) { 131 132 WARN_ON(1); 132 133 return -EPERM; ··· 150 151 unsigned long flags; 151 152 int ret; 152 153 153 - /*Access to the GFX unit is handled by GPU code */ 154 + /* Access to the GFX unit is handled by GPU code */ 154 155 if (port == BT_MBI_UNIT_GFX) { 155 156 WARN_ON(1); 156 157 return -EPERM;