linux-next: build failure after merge of the block tree

[Stephen Rothwell]

Hi Jens,

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

drivers/block/rsxx/core.c:322:22: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'rsxx_pci_probe'
drivers/block/rsxx/core.c:513:23: error: expected '=', ',', ';', 'asm' or 
'__attribute__' before 'rsxx_pci_remove'
drivers/block/rsxx/core.c:610:12: error: 'rsxx_pci_probe' undeclared here (not 
in a function)
drivers/block/rsxx/core.c:611:2: error: implicit declaration of function 
'__devexit_p' [-Werror=implicit-function-declaration]
drivers/block/rsxx/core.c:611:25: error: 'rsxx_pci_remove' undeclared here (not 
in a function)
drivers/block/rsxx/core.c:51:8: warning: 'rsxx_disk_ida' defined but not used 
[-Wunused-variable]
drivers/block/rsxx/core.c:52:8: warning: 'rsxx_ida_lock' defined but not used 
[-Wunused-variable]
drivers/block/rsxx/core.c:219:13: warning: 'card_event_handler' defined but not 
used [-Wunused-function]
drivers/block/rsxx/core.c:311:12: warning: 'rsxx_compatibility_check' defined 
but not used [-Wunused-function]

Caused by commit 8722ff8cdbfa ("block: IBM RamSan 70/80 device driver")
interacting with commit 54b956b90360 ("Remove __dev* markings from
init.h") from Linus' tree (as of v3.8-rc4).

I added the following merge fix patch:

From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Wed, 6 Feb 2013 14:03:13 +1100
Subject: [PATCH] block: remove new __devinit/exit annotations

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
 drivers/block/rsxx/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index f752191..83dadbe 100644
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -319,7 +319,7 @@ static int rsxx_compatibility_check(struct rsxx_cardinfo 
*card)
        return 0;
 }
 
-static int __devinit rsxx_pci_probe(struct pci_dev *dev,
+static int rsxx_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *id)
 {
        struct rsxx_cardinfo *card;
@@ -510,7 +510,7 @@ failed_ida_get:
        return st;
 }
 
-static void __devexit rsxx_pci_remove(struct pci_dev *dev)
+static void rsxx_pci_remove(struct pci_dev *dev)
 {
        struct rsxx_cardinfo *card = pci_get_drvdata(dev);
        unsigned long flags;
@@ -608,7 +608,7 @@ static struct pci_driver rsxx_pci_driver = {
        .name           = DRIVER_NAME,
        .id_table       = rsxx_pci_ids,
        .probe          = rsxx_pci_probe,
-       .remove         = __devexit_p(rsxx_pci_remove),
+       .remove         = rsxx_pci_remove,
        .suspend        = rsxx_pci_suspend,
        .shutdown       = rsxx_pci_shutdown,
 };
-- 
1.8.1

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpT54_yQnEqd.pgp
Description: PGP signature