linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Randy Dunlap <rdunlap@infradead.org>
To: Thierry Reding <thierry.reding@gmail.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Mark Brown <broonie@kernel.org>,
	Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>,
	Ashutosh Dixit <ashutosh.dixit@intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Nikhil Rao <nikhil.rao@intel.com>,
	Sudeep Dutt <sudeep.dutt@intel.com>
Subject: [PATCH -next] misc: fix various misc/mic/host/ build errors
Date: Mon, 14 Oct 2013 12:38:06 -0700	[thread overview]
Message-ID: <525C481E.1010908@infradead.org> (raw)
In-Reply-To: <1381762088-18880-1-git-send-email-treding@nvidia.com>

From: Randy Dunlap <rdunlap@infradead.org>

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 <rdunlap@infradead.org>
Cc: Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Nikhil Rao <nikhil.rao@intel.com>
Cc: Sudeep Dutt <sudeep.dutt@intel.com>
---
 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);

  parent reply	other threads:[~2013-10-14 19:38 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of th imx-mxs tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the omap_dss2 tree Thierry Reding
2013-10-15  6:47   ` Tomi Valkeinen
2013-10-14 14:48 ` linux-next: manual merge of the pm tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the spi tree Thierry Reding
2013-10-14 16:44   ` Mika Westerberg
2013-10-14 18:58 ` linux-next: Tree for Oct 14 (bcache) Randy Dunlap
2013-10-14 20:27   ` Mark Brown
     [not found]     ` <20131014202723.GQ2443-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-10-15  8:46       ` Thierry Reding
     [not found]         ` <20131015084631.GK7856-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2013-10-15  9:36           ` Mark Brown
     [not found]   ` <525C3EC2.20404-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2013-10-15  8:44     ` Thierry Reding
2013-10-14 19:36 ` [PATCH -next] netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled Randy Dunlap
2013-10-14 19:53   ` Joe Perches
2013-10-14 20:47     ` Randy Dunlap
2013-10-14 21:24       ` Joe Perches
2013-10-14 21:25       ` Joe Perches
2013-10-17 19:57   ` David Miller
2013-10-14 19:38 ` Randy Dunlap [this message]
2013-10-16 19:26   ` [PATCH -next] misc: fix various misc/mic/host/ build errors Greg Kroah-Hartman
2013-10-16 19:41     ` Randy Dunlap
2013-10-16 19:44       ` Greg Kroah-Hartman
2013-10-16 20:30         ` Thierry Reding
2013-10-16 20:37           ` Greg Kroah-Hartman
2013-10-17 14:02             ` Thierry Reding
2013-10-17 14:15               ` Greg Kroah-Hartman
2013-10-17 14:16               ` Mark Brown
2013-10-17 14:21                 ` Thierry Reding
2013-10-17 14:49                   ` Greg Kroah-Hartman
2013-10-16 20:47           ` Mark Brown
2013-10-14 19:39 ` [PATCH -next] staging/mt29f_spinand: fix build error when ONDIEECC not enabled Randy Dunlap
2013-10-14 20:51 ` linux-next: Tree for Oct 14 (ceph) Randy Dunlap

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=525C481E.1010908@infradead.org \
    --to=rdunlap@infradead.org \
    --cc=ashutosh.dixit@intel.com \
    --cc=broonie@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=harshavardhan.r.kharche@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nikhil.rao@intel.com \
    --cc=sudeep.dutt@intel.com \
    --cc=thierry.reding@gmail.com \
    /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;
as well as URLs for NNTP newsgroup(s).