git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: remove unnecessary argument checking
[safe/jmp/linux-2.6]
/
drivers
/
acpi
/
dock.c
diff --git
a/drivers/acpi/dock.c
b/drivers/acpi/dock.c
index
913bb1e
..
3a2cfef
100644
(file)
--- a/
drivers/acpi/dock.c
+++ b/
drivers/acpi/dock.c
@@
-33,6
+33,8
@@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
+#define PREFIX "ACPI: "
+
#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
ACPI_MODULE_NAME("dock");
#define ACPI_DOCK_DRIVER_DESCRIPTION "ACPI Dock Station Driver"
ACPI_MODULE_NAME("dock");
@@
-231,18
+233,16
@@
static int is_ata(acpi_handle handle)
static int is_battery(acpi_handle handle)
{
struct acpi_device_info *info;
static int is_battery(acpi_handle handle)
{
struct acpi_device_info *info;
- struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
int ret = 1;
int ret = 1;
- if (!ACPI_SUCCESS(acpi_get_object_info(handle, &
buffer
)))
+ if (!ACPI_SUCCESS(acpi_get_object_info(handle, &
info
)))
return 0;
return 0;
- info = buffer.pointer;
if (!(info->valid & ACPI_VALID_HID))
ret = 0;
else
if (!(info->valid & ACPI_VALID_HID))
ret = 0;
else
- ret = !strcmp("PNP0C0A", info->hardware_id.
value
);
+ ret = !strcmp("PNP0C0A", info->hardware_id.
string
);
- kfree(
buffer.pointer
);
+ kfree(
info
);
return ret;
}
return ret;
}
@@
-294,7
+294,7
@@
EXPORT_SYMBOL_GPL(is_dock_device);
*/
static int dock_present(struct dock_station *ds)
{
*/
static int dock_present(struct dock_station *ds)
{
- unsigned long sta;
+ unsigned long
long
sta;
acpi_status status;
if (ds) {
acpi_status status;
if (ds) {
@@
-855,10
+855,14
@@
fdd_out:
static ssize_t show_docked(struct device *dev,
struct device_attribute *attr, char *buf)
{
static ssize_t show_docked(struct device *dev,
struct device_attribute *attr, char *buf)
{
+ struct acpi_device *tmp;
+
struct dock_station *dock_station = *((struct dock_station **)
dev->platform_data);
struct dock_station *dock_station = *((struct dock_station **)
dev->platform_data);
- return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
+ if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
+ return snprintf(buf, PAGE_SIZE, "1\n");
+ return snprintf(buf, PAGE_SIZE, "0\n");
}
static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
}
static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
@@
-900,7
+904,7
@@
static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
static ssize_t show_dock_uid(struct device *dev,
struct device_attribute *attr, char *buf)
{
static ssize_t show_dock_uid(struct device *dev,
struct device_attribute *attr, char *buf)
{
- unsigned long lbuf;
+ unsigned long l
ong l
buf;
struct dock_station *dock_station = *((struct dock_station **)
dev->platform_data);
acpi_status status = acpi_evaluate_integer(dock_station->handle,
struct dock_station *dock_station = *((struct dock_station **)
dev->platform_data);
acpi_status status = acpi_evaluate_integer(dock_station->handle,
@@
-908,7
+912,7
@@
static ssize_t show_dock_uid(struct device *dev,
if (ACPI_FAILURE(status))
return 0;
if (ACPI_FAILURE(status))
return 0;
- return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);
+ return snprintf(buf, PAGE_SIZE, "%l
l
x\n", lbuf);
}
static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
}
static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
@@
-973,7
+977,7
@@
static int dock_add(acpi_handle handle)
sizeof(struct dock_station *));
/* we want the dock device to send uevents */
sizeof(struct dock_station *));
/* we want the dock device to send uevents */
- d
ock_device->dev.uevent_suppress = 0
;
+ d
ev_set_uevent_suppress(&dock_device->dev, 0)
;
if (is_dock(handle))
dock_station->flags |= DOCK_IS_DOCK;
if (is_dock(handle))
dock_station->flags |= DOCK_IS_DOCK;
@@
-984,7
+988,7
@@
static int dock_add(acpi_handle handle)
ret = device_create_file(&dock_device->dev, &dev_attr_docked);
if (ret) {
ret = device_create_file(&dock_device->dev, &dev_attr_docked);
if (ret) {
- printk("Error %d adding sysfs file\n", ret);
+ printk(
KERN_ERR
"Error %d adding sysfs file\n", ret);
platform_device_unregister(dock_device);
kfree(dock_station);
dock_station = NULL;
platform_device_unregister(dock_device);
kfree(dock_station);
dock_station = NULL;
@@
-992,7
+996,7
@@
static int dock_add(acpi_handle handle)
}
ret = device_create_file(&dock_device->dev, &dev_attr_undock);
if (ret) {
}
ret = device_create_file(&dock_device->dev, &dev_attr_undock);
if (ret) {
- printk("Error %d adding sysfs file\n", ret);
+ printk(
KERN_ERR
"Error %d adding sysfs file\n", ret);
device_remove_file(&dock_device->dev, &dev_attr_docked);
platform_device_unregister(dock_device);
kfree(dock_station);
device_remove_file(&dock_device->dev, &dev_attr_docked);
platform_device_unregister(dock_device);
kfree(dock_station);
@@
-1001,7
+1005,7
@@
static int dock_add(acpi_handle handle)
}
ret = device_create_file(&dock_device->dev, &dev_attr_uid);
if (ret) {
}
ret = device_create_file(&dock_device->dev, &dev_attr_uid);
if (ret) {
- printk("Error %d adding sysfs file\n", ret);
+ printk(
KERN_ERR
"Error %d adding sysfs file\n", ret);
device_remove_file(&dock_device->dev, &dev_attr_docked);
device_remove_file(&dock_device->dev, &dev_attr_undock);
platform_device_unregister(dock_device);
device_remove_file(&dock_device->dev, &dev_attr_docked);
device_remove_file(&dock_device->dev, &dev_attr_undock);
platform_device_unregister(dock_device);
@@
-1011,7
+1015,7
@@
static int dock_add(acpi_handle handle)
}
ret = device_create_file(&dock_device->dev, &dev_attr_flags);
if (ret) {
}
ret = device_create_file(&dock_device->dev, &dev_attr_flags);
if (ret) {
- printk("Error %d adding sysfs file\n", ret);
+ printk(
KERN_ERR
"Error %d adding sysfs file\n", ret);
device_remove_file(&dock_device->dev, &dev_attr_docked);
device_remove_file(&dock_device->dev, &dev_attr_undock);
device_remove_file(&dock_device->dev, &dev_attr_uid);
device_remove_file(&dock_device->dev, &dev_attr_docked);
device_remove_file(&dock_device->dev, &dev_attr_undock);
device_remove_file(&dock_device->dev, &dev_attr_uid);
@@
-1142,9
+1146,10
@@
static int __init dock_init(void)
static void __exit dock_exit(void)
{
struct dock_station *dock_station;
static void __exit dock_exit(void)
{
struct dock_station *dock_station;
+ struct dock_station *tmp;
unregister_acpi_bus_notifier(&dock_acpi_notifier);
unregister_acpi_bus_notifier(&dock_acpi_notifier);
- list_for_each_entry
(dock_station
, &dock_stations, sibiling)
+ list_for_each_entry
_safe(dock_station, tmp
, &dock_stations, sibiling)
dock_remove(dock_station);
}
dock_remove(dock_station);
}