Commit 9a634c71 authored by Adrian Bunk's avatar Adrian Bunk Committed by Christoph Hellwig

[PATCH] SCSI nsp32.c: remove inlines

Trying to compile drivers/scsi/nsp32.c in 2.6.8-rc1-mm1 using gcc 3.4
results in compile errors starting with the following:

<--  snip  -->

...
  CC      drivers/scsi/nsp32.o
drivers/scsi/nsp32.c: In function `nsp32_prom_start':
drivers/scsi/nsp32.c:270: sorry, unimplemented: inlining failed in call
to 'nsp32_prom_set': function body not available
drivers/scsi/nsp32.c:3348: sorry, unimplemented: called from here
drivers/scsi/nsp32.c:270: sorry, unimplemented: inlining failed in call
to 'nsp32_prom_set': function body not available
drivers/scsi/nsp32.c:3349: sorry, unimplemented: called from here
drivers/scsi/nsp32.c:270: sorry, unimplemented: inlining failed in call
to 'nsp32_prom_set': function body not available
drivers/scsi/nsp32.c:3350: sorry, unimplemented: called from here
drivers/scsi/nsp32.c:270: sorry, unimplemented: inlining failed in call
to 'nsp32_prom_set': function body not available
drivers/scsi/nsp32.c:3351: sorry, unimplemented: called from here
drivers/scsi/nsp32.c:270: sorry, unimplemented: inlining failed in call
to 'nsp32_prom_set': function body not available
drivers/scsi/nsp32.c:3353: sorry, unimplemented: called from here
make[2]: *** [drivers/scsi/nsp32.o] Error 1


<--  snip  -->


The patch below removes the inlines from nsp32_prom_{get,set}.

An alternative approach would be to move the functions above the place
where they are called the first time.
Signed-off-by: default avatarAdrian Bunk <bunk@fs.tum.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 5a2602de
...@@ -267,8 +267,8 @@ static void nsp32_prom_stop (nsp32_hw_data *); ...@@ -267,8 +267,8 @@ static void nsp32_prom_stop (nsp32_hw_data *);
static int nsp32_prom_read (nsp32_hw_data *, int); static int nsp32_prom_read (nsp32_hw_data *, int);
static int nsp32_prom_read_bit (nsp32_hw_data *); static int nsp32_prom_read_bit (nsp32_hw_data *);
static void nsp32_prom_write_bit(nsp32_hw_data *, int); static void nsp32_prom_write_bit(nsp32_hw_data *, int);
static inline void nsp32_prom_set (nsp32_hw_data *, int, int); static void nsp32_prom_set (nsp32_hw_data *, int, int);
static inline int nsp32_prom_get (nsp32_hw_data *, int); static int nsp32_prom_get (nsp32_hw_data *, int);
/* debug/warning/info message */ /* debug/warning/info message */
static void nsp32_message (const char *, int, char *, char *, ...); static void nsp32_message (const char *, int, char *, char *, ...);
...@@ -3387,7 +3387,7 @@ static int nsp32_prom_read_bit(nsp32_hw_data *data) ...@@ -3387,7 +3387,7 @@ static int nsp32_prom_read_bit(nsp32_hw_data *data)
return val; return val;
} }
static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val) static void nsp32_prom_set(nsp32_hw_data *data, int bit, int val)
{ {
int base = data->BaseAddress; int base = data->BaseAddress;
int tmp; int tmp;
...@@ -3405,7 +3405,7 @@ static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val) ...@@ -3405,7 +3405,7 @@ static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val)
udelay(10); udelay(10);
} }
static inline int nsp32_prom_get(nsp32_hw_data *data, int bit) static int nsp32_prom_get(nsp32_hw_data *data, int bit)
{ {
int base = data->BaseAddress; int base = data->BaseAddress;
int tmp, ret; int tmp, ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment