Patchwork linux-next: build failure after merge of the net-next tree

login
register
mail settings
Submitter Stephen Rothwell
Date Jan. 11, 2013, 2:18 a.m.
Message ID <20130111131807.5d41574cda2c8d6a8b08ae1f@canb.auug.org.au>
Download mbox | patch
Permalink /patch/211193/
State Accepted
Delegated to: David Miller
Headers show

Comments

Stephen Rothwell - Jan. 11, 2013, 2:18 a.m.
Hi all,

After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:1721:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'qlcnic_probe'
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:1912:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'qlcnic_remove'

Caused by commits 7e2cf4feba05 ("qlcnic: change driver hardware interface
mechanism") and 13159183ec7a ("qlcnic: 83xx base driver") from the
net-next tree interacting with commit 54b956b90360 ("Remove __dev*
markings from init.h") from the drover-core.current tree.

I have added the following merge fix patch for today which could be added
directly to the scsi tree (please).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 11 Jan 2013 13:15:05 +1100
Subject: [PATCH] qlcnic: remove new __dev* annotations

CONFIG_HOTPLUG is always true now and the __dev* macros have been removed.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index d331313..fb7ac8e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1717,7 +1717,7 @@  int qlcnic_alloc_tx_rings(struct qlcnic_adapter *adapter,
 	return 0;
 }
 
-static int __devinit
+static int
 qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	struct net_device *netdev = NULL;
@@ -1909,7 +1909,7 @@  err_out_disable_pdev:
 	return err;
 }
 
-static void __devexit qlcnic_remove(struct pci_dev *pdev)
+static void qlcnic_remove(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter;
 	struct net_device *netdev;