| .. | .. |
|---|
| 8 | 8 | * Copyright (C) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com) |
|---|
| 9 | 9 | * Copyright (C) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com) |
|---|
| 10 | 10 | * Copyright (C) 2002,2003 NEC Corporation |
|---|
| 11 | | - * Copyright (C) 2003-2005 Matthew Wilcox (matthew.wilcox@hp.com) |
|---|
| 11 | + * Copyright (C) 2003-2005 Matthew Wilcox (willy@infradead.org) |
|---|
| 12 | 12 | * Copyright (C) 2003-2005 Hewlett Packard |
|---|
| 13 | 13 | * |
|---|
| 14 | 14 | * All rights reserved. |
|---|
| .. | .. |
|---|
| 33 | 33 | * struct slot - slot information for each *physical* slot |
|---|
| 34 | 34 | */ |
|---|
| 35 | 35 | struct slot { |
|---|
| 36 | | - struct hotplug_slot *hotplug_slot; |
|---|
| 36 | + struct hotplug_slot hotplug_slot; |
|---|
| 37 | 37 | struct acpiphp_slot *acpi_slot; |
|---|
| 38 | | - struct hotplug_slot_info info; |
|---|
| 39 | 38 | unsigned int sun; /* ACPI _SUN (Slot User Number) value */ |
|---|
| 40 | 39 | }; |
|---|
| 41 | 40 | |
|---|
| 42 | 41 | static inline const char *slot_name(struct slot *slot) |
|---|
| 43 | 42 | { |
|---|
| 44 | | - return hotplug_slot_name(slot->hotplug_slot); |
|---|
| 43 | + return hotplug_slot_name(&slot->hotplug_slot); |
|---|
| 44 | +} |
|---|
| 45 | + |
|---|
| 46 | +static inline struct slot *to_slot(struct hotplug_slot *hotplug_slot) |
|---|
| 47 | +{ |
|---|
| 48 | + return container_of(hotplug_slot, struct slot, hotplug_slot); |
|---|
| 45 | 49 | } |
|---|
| 46 | 50 | |
|---|
| 47 | 51 | /* |
|---|