Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull the trivial tree from Jiri Kosina:
 "Tiny usual fixes all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  doc: fix old config name of kprobetrace
  fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
  btrfs: fix the commment for the action flags in delayed-ref.h
  btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
  vfs: fix kerneldoc for generic_fh_to_parent()
  treewide: fix comment/printk/variable typos
  ipr: fix small coding style issues
  doc: fix broken utf8 encoding
  nfs: comment fix
  platform/x86: fix asus_laptop.wled_type module parameter
  mfd: printk/comment fixes
  doc: getdelays.c: remember to close() socket on error in create_nl_socket()
  doc: aliasing-test: close fd on write error
  mmc: fix comment typos
  dma: fix comments
  spi: fix comment/printk typos in spi
  Coccinelle: fix typo in memdup_user.cocci
  tmiofb: missing NULL pointer checks
  tools: perf: Fix typo in tools/perf
  tools/testing: fix comment / output typos
  ...

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 97825f116954..76ad72d32c3f 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter)
 
         adapter->host->sg_tablesize = adapter->sglen;
 
-
         /* use HP firmware and bios version encoding
            Note: fw_version[0|1] and bios_version[0|1] were originally shifted
            right 8 bits making them zero. This 0 value was hardcoded to fix
            sparse warnings. */
-        if (adapter->product_info.subsysvid == HP_SUBSYS_VID) {
+        if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {
                 sprintf (adapter->fw_version, "%c%d%d.%d%d",
                          adapter->product_info.fw_version[2],
                          0,
@@ -4716,7 +4715,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
          * support, since this firmware cannot handle 64 bit
          * addressing
          */
-        if ((subsysvid == HP_SUBSYS_VID) &&
+        if ((subsysvid == PCI_VENDOR_ID_HP) &&
             ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
                 /*
                  * which firmware