Skip to content

Commit

Permalink
ACPI: Replace struct acpi_bus_ops with enum type
Browse files Browse the repository at this point in the history 
Notice that one member of struct acpi_bus_ops, acpi_op_add, is not
used anywhere any more and the relationship between its remaining
members, acpi_op_match and acpi_op_start, is such that it doesn't
make sense to set the latter without setting the former at the same
time.  Therefore, replace struct acpi_bus_ops with new a enum type,
enum acpi_bus_add_type, with three values, ACPI_BUS_ADD_BASIC,
ACPI_BUS_ADD_MATCH, ACPI_BUS_ADD_START, corresponding to
both acpi_op_match and acpi_op_start unset, acpi_op_match set and
acpi_op_start unset, and both acpi_op_match and acpi_op_start set,
respectively.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
  • Loading branch information
Rafael J. Wysocki committed Jan 3, 2013
1 parent ca7b3c4 commit a2d06a1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 30 deletions.
35 changes: 12 additions & 23 deletions drivers/acpi/scan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ static int acpi_bus_match(struct device *dev, struct device_driver *drv)
struct acpi_device *acpi_dev = to_acpi_device(dev);
struct acpi_driver *acpi_drv = to_acpi_driver(drv);

return acpi_dev->bus_ops.acpi_op_match
return acpi_dev->add_type >= ACPI_BUS_ADD_MATCH
&& !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
}

Expand Down Expand Up @@ -580,7 +580,7 @@ static int acpi_device_probe(struct device * dev)

ret = acpi_bus_driver_init(acpi_dev, acpi_drv);
if (!ret) {
if (acpi_dev->bus_ops.acpi_op_start)
if (acpi_dev->add_type == ACPI_BUS_ADD_START)
acpi_start_single_object(acpi_dev);

if (acpi_drv->ops.notify) {
Expand Down Expand Up @@ -1433,7 +1433,7 @@ static void acpi_hot_add_bind(struct acpi_device *device)
static int acpi_add_single_object(struct acpi_device **child,
acpi_handle handle, int type,
unsigned long long sta,
struct acpi_bus_ops *ops)
enum acpi_bus_add_type add_type)
{
int result;
struct acpi_device *device;
Expand All @@ -1449,7 +1449,7 @@ static int acpi_add_single_object(struct acpi_device **child,
device->device_type = type;
device->handle = handle;
device->parent = acpi_bus_get_parent(handle);
device->bus_ops = *ops; /* workround for not call .start */
device->add_type = add_type;
STRUCT_TO_INT(device->status) = sta;

acpi_device_get_busid(device);
Expand Down Expand Up @@ -1502,7 +1502,7 @@ static int acpi_add_single_object(struct acpi_device **child,

result = acpi_device_register(device);

if (device->bus_ops.acpi_op_match)
if (device->add_type >= ACPI_BUS_ADD_MATCH)
acpi_hot_add_bind(device);

end:
Expand All @@ -1526,16 +1526,12 @@ static int acpi_add_single_object(struct acpi_device **child,

static void acpi_bus_add_power_resource(acpi_handle handle)
{
struct acpi_bus_ops ops = {
.acpi_op_start = 1,
.acpi_op_match = 1,
};
struct acpi_device *device = NULL;

acpi_bus_get_device(handle, &device);
if (!device)
acpi_add_single_object(&device, handle, ACPI_BUS_TYPE_POWER,
ACPI_STA_DEFAULT, &ops);
ACPI_STA_DEFAULT, ACPI_BUS_ADD_START);
}

static int acpi_bus_type_and_status(acpi_handle handle, int *type,
Expand Down Expand Up @@ -1604,16 +1600,13 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,

acpi_bus_get_device(handle, &device);
if (!device) {
struct acpi_bus_ops ops = {
.acpi_op_start = !!context,
.acpi_op_match = 0,
};

acpi_add_single_object(&device, handle, type, sta, &ops);
acpi_add_single_object(&device, handle, type, sta,
ACPI_BUS_ADD_BASIC);
if (!device)
return AE_CTRL_DEPTH;

device->bus_ops.acpi_op_match = 1;
device->add_type = context ?
ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH;
acpi_hot_add_bind(device);
}

Expand Down Expand Up @@ -1793,10 +1786,6 @@ static int acpi_bus_scan_fixed(void)
{
int result = 0;
struct acpi_device *device = NULL;
struct acpi_bus_ops ops = {
.acpi_op_start = 1,
.acpi_op_match = 1,
};

/*
* Enumerate all fixed-feature devices.
Expand All @@ -1805,15 +1794,15 @@ static int acpi_bus_scan_fixed(void)
result = acpi_add_single_object(&device, NULL,
ACPI_BUS_TYPE_POWER_BUTTON,
ACPI_STA_DEFAULT,
&ops);
ACPI_BUS_ADD_START);
device_init_wakeup(&device->dev, true);
}

if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
result = acpi_add_single_object(&device, NULL,
ACPI_BUS_TYPE_SLEEP_BUTTON,
ACPI_STA_DEFAULT,
&ops);
ACPI_BUS_ADD_START);
}

return result;
Expand Down
15 changes: 8 additions & 7 deletions include/acpi/acpi_bus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld
#define ACPI_BUS_FILE_ROOT "acpi"
extern struct proc_dir_entry *acpi_root_dir;

enum acpi_bus_add_type {
ACPI_BUS_ADD_BASIC = 0,
ACPI_BUS_ADD_MATCH,
ACPI_BUS_ADD_START,
ACPI_BUS_ADD_TYPE_COUNT
};

enum acpi_bus_removal_type {
ACPI_BUS_REMOVAL_NORMAL = 0,
ACPI_BUS_REMOVAL_EJECT,
Expand Down Expand Up @@ -95,12 +102,6 @@ typedef int (*acpi_op_bind) (struct acpi_device * device);
typedef int (*acpi_op_unbind) (struct acpi_device * device);
typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);

struct acpi_bus_ops {
u32 acpi_op_add:1;
u32 acpi_op_start:1;
u32 acpi_op_match:1;
};

struct acpi_device_ops {
acpi_op_add add;
acpi_op_remove remove;
Expand Down Expand Up @@ -284,7 +285,7 @@ struct acpi_device {
struct acpi_driver *driver;
void *driver_data;
struct device dev;
struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */
enum acpi_bus_add_type add_type; /* how to handle adding */
enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
u8 physical_node_count;
struct list_head physical_node_list;
Expand Down

0 comments on commit a2d06a1

Please sign in to comment.