Subject: [PATCH -next] misc: fix various misc/mic/host/ build errors

From: Randy Dunlap <[email-masked]>
Date: Mon, 14 Oct 2013 12:38:06 -0700

From: Randy Dunlap <[email-masked]>

Fix various build errors (on x86_64) for drivers/misc/mic/host/:

  drivers/misc/mic/host/mic_main.c:378:3: error: too many arguments to function 'sysfs_get_dirent'
  drivers/misc/mic/host/mic_intr.h:134:58: warning: 'struct pci_dev' declared inside parameter list [enabled by default]
  drivers/misc/mic/host/mic_intr.h:134:58: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
  drivers/misc/mic/host/mic_intr.h:135:58: warning: 'struct pci_dev' declared inside parameter list [enabled by default]
  drivers/misc/mic/host/mic_device.h:169:2: error: implicit declaration of function 'ioread32' [-Werror=implicit-function-declaration]
  drivers/misc/mic/host/mic_device.h: In function 'mic_mmio_read':
  drivers/misc/mic/host/mic_device.h:169:2: error: implicit declaration of function 'ioread32' [-Werror=implicit-function-declaration]
  drivers/misc/mic/host/mic_device.h: In function 'mic_mmio_write':
  drivers/misc/mic/host/mic_device.h:183:2: error: implicit declaration of function 'iowrite32' [-Werror=implicit-function-declaration]

Signed-off-by: Randy Dunlap <[email-masked]>
Cc: Harshavardhan R Kharche <[email-masked]>
Cc: Ashutosh Dixit <[email-masked]>
Cc: Greg Kroah-Hartman <[email-masked]>
Cc: Nikhil Rao <[email-masked]>
Cc: Sudeep Dutt <[email-masked]>
---
 drivers/misc/mic/host/mic_device.h |    1 +
 drivers/misc/mic/host/mic_intr.h   |    1 +
 drivers/misc/mic/host/mic_main.c   |    3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

--- next-2013-1014.orig/drivers/misc/mic/host/mic_main.c
+++ next-2013-1014/drivers/misc/mic/host/mic_main.c
@@ -374,8 +374,7 @@ static int mic_probe(struct pci_dev *pde
 			"device_create_with_groups failed rc %d\n", rc);
 		goto smpt_uninit;
 	}
-	mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd,
-		NULL, "state");
+	mdev->state_sysfs = sysfs_get_dirent(mdev->sdev->kobj.sd, "state");
 	if (!mdev->state_sysfs) {
 		rc = -ENODEV;
 		dev_err(&pdev->dev, "sysfs_get_dirent failed rc %d\n", rc);
--- next-2013-1014.orig/drivers/misc/mic/host/mic_device.h
+++ next-2013-1014/drivers/misc/mic/host/mic_device.h
@@ -24,6 +24,7 @@
 #include <linux/cdev.h>
 #include <linux/idr.h>
 #include <linux/notifier.h>
+#include <asm-generic/iomap.h>
 
 #include "mic_intr.h"
 
--- next-2013-1014.orig/drivers/misc/mic/host/mic_intr.h
+++ next-2013-1014/drivers/misc/mic/host/mic_intr.h
@@ -131,6 +131,7 @@ struct mic_irq *mic_request_irq(struct m
 
 void mic_free_irq(struct mic_device *mdev,
 		struct mic_irq *cookie, void *data);
+struct pci_dev;
 int mic_setup_interrupts(struct mic_device *mdev, struct pci_dev *pdev);
 void mic_free_interrupts(struct mic_device *mdev, struct pci_dev *pdev);
 void mic_intr_restore(struct mic_device *mdev);