Fix 2 very ugly return constructs.

This one converts the error handling in init_slots to use gotos to avoid code
duplication.

The function hardware_test only tells that there are no tests. If we just
kill it the file "test" in the slot's directory will not show up which
means pretty much the same.

This patch kills the space before the opening brace in function
declarations. It also beautifies some ugly return statements.

Matthew Wilcox wrote:
> On Thu, Apr 22, 2004 at 01:18:23PM +0200, Rolf Eike Beer wrote:
> > slot_paranoia_check is only another kind of checking everything for NULL.
> > Removing this leads to function get_slot is reduced to a simple cast, so
> > this function can be killed also.
>
> Since private is void *, you don't even need the casts.
>
> >  static int enable_slot (struct hotplug_slot *hotplug_slot)
> >  {
> > -	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
> > +	struct slot *slot = (struct slot *)hotplug_slot->private;
>
> 	struct slot *slot = hotplug_slot->private;
>
> is enough.

Fixed.

If the "struct hotplug_struct *" parameter to any function in
hotplug_slots_ops is ever NULL something bogus is going on. In this case we
should just oops and not hide the bug. This also fixes the driver name used in
debug messages.

Attached patch fix the problem I have found during DLPAR I/O slots
testing on our new hardware.  rpaphp needs to set eeh-option(eanbled)
for newly added IOA prior to performing PCI config(pci_setup_device),
otherwise the pci_dev of the IOA will have invalid base address
information.

Linas Vepstas impleted eeh changes.

The messages read:

PCI: Address space collision on region 8 of bridge 0000:00:1f.0 [1180:11bf]
PCI: Ignoring BAR0-3 of IDE controller 0000:00:1f.1
Transparent bridge - 0000:00:1e.0
PCI: Using IRQ router PIIX/ICH [8086/24cc] at 0000:00:1f.0
PCI: Found IRQ 11 for device 0000:00:1f.1

The following patch adds "PCI: " in front of the message and KERN_INFO as well.
Compile&boot tested.

Jochen

Can you please feed the following patch to Andrew?

into ppc970.osdl.org:/home/torvalds/v2.6/linux

a ppc64 tree.

into kernel.bkbits.net:/home/davem/net-2.6

More functions and data that should be static.

Thanks to Dru <andru@treshna.com>, who provided an easy way to reproduce
the problem.

What we have in lib/rwsem.c:__rwsem_do_wake():
	int woken, loop;
	^^^
and several lines below:
	loop = woken;
	woken *= RWSEM_ACTIVE_BIAS-RWSEM_WAITING_BIAS;
	woken -= RWSEM_ACTIVE_BIAS;

However, rw_semaphore->count is 64-bit on Alpha, so
RWSEM_WAITING_BIAS has been defined as -0x0000000100000000L.
Obviously, this blows up in the write contention case.

Fix new ISDN CAPI's internal ncci list semaphore if
CONFIG_ISDN_CAPI_MIDDLEWARE is disabled.

Thanks to Florian Schirmer.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into sgi.com:/source2/xfs-linux-2.6

SGI Modid: xfs-linux:xfs-kern:170489a

SGI Modid: xfs-linux:xfs-kern:170509a

SGI Modid: xfs-linux:xfs-kern:170448a

From: Tom Rini <trini@kernel.crashing.org>

This patch updates support for the Motorola PrPMC750 platform.  Most of the
size in this patch comes from merging prpmc750_pci.c and prpmc750_setup.c into
just prpmc750.c.

From: Tom Rini <trini@kernel.crashing.org>

This patch adds openpic_hookup_cascade(offset, name, handler) which allows for
an arbitrary interrupt controller to be hooked up as a cascade to the openpic.
 This also allows for platforms to just not have a cascaded controller.

From: Tom Rini <trini@kernel.crashing.org>

This patch updates support for the SBS K2 platform.  Most of the size in this
patch comes from merging k2_pci.c and k2_setup.c into just k2.c.

From: Christoph Hellwig <hch@lst.de>

asm-ppc/elf.h uses a pointer to struct task_struct without any
forward-declaration.

In file included from include/linux/elf.h:5,
                 from arch/ppc/boot/simple/misc.c:20:
include/asm/elf.h:102: warning: `struct task_struct' declared inside parameter list
include/asm/elf.h:102: warning: its scope is only this definition or declaration, which is probably not what you want

From: Tom Rini <trini@kernel.crashing.org>

And when trying to catch up on old patches, I forgot this hunk:

From: Tom Rini <trini@kernel.crashing.org>

When I changed some '#if FOO' tests to '#ifdef FOO' I forgot to make sure
that nothing was doing #define FOO 0.  So after auditing all of the changes
I made, the following is needed:

From: Olof Johansson <olof@austin.ibm.com>

On pSeries LPARs we might end up with NUMA nodes that only have memory and
no CPUs.  Only the CPU configuration code actually set a node online, so
memory-only nodes wouldn't show up in sysfs.  Below patch adds the
set_online call to the memory loop too.

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

fs/dquot.c: In function `vfs_quota_off':
fs/dquot.c:1328: warning: label `out' defined but not used

into lips.borg.umn.edu:/export/music/bkroot/xfs-linux-2.6

The function tcp_send_skb is only called from tcp_fin, and is always called
with force_queue=1.  Therefore, it no longer needs to be global and the code
to send right now can be removed.  Because it always queues, change the
name as well, and fix up the comment.

into nuts.davemloft.net:/disk1/BK/net-2.6