On Thu, Oct 08, 2009 at 06:07:47AM +0800, Alex Chiang wrote:
> Instead of adding a (struct dock_station **) to our dock device's
> platform data, we can add the (struct dock_station *) directly.
>
> This change saves us some silly casting.
>
> Signed-off-by: Alex Chiang <achiang@xxxxxx>
> ---
>
> drivers/acpi/dock.c | 19 +++++++------------
> 1 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
> index 1d693a1..e53d49b 100644
> --- a/drivers/acpi/dock.c
> +++ b/drivers/acpi/dock.c
> @@ -857,8 +857,7 @@ static ssize_t show_docked(struct device *dev,
> {
> struct acpi_device *tmp;
>
> - struct dock_station *dock_station = *((struct dock_station **)
> - dev->platform_data);
> + struct dock_station *dock_station = dev->platform_data;
>
> if (ACPI_SUCCESS(acpi_bus_get_device(dock_station->handle, &tmp)))
> return snprintf(buf, PAGE_SIZE, "1\n");
> @@ -872,8 +871,7 @@ static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
> static ssize_t show_flags(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - struct dock_station *dock_station = *((struct dock_station **)
> - dev->platform_data);
> + struct dock_station *dock_station = dev->platform_data;
> return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags);
>
> }
> @@ -886,8 +884,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
> const char *buf, size_t count)
> {
> int ret;
> - struct dock_station *dock_station = *((struct dock_station **)
> - dev->platform_data);
> + struct dock_station *dock_station = dev->platform_data;
>
> if (!count)
> return -EINVAL;
> @@ -905,8 +902,7 @@ static ssize_t show_dock_uid(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> unsigned long long lbuf;
> - struct dock_station *dock_station = *((struct dock_station **)
> - dev->platform_data);
> + struct dock_station *dock_station = dev->platform_data;
> acpi_status status = acpi_evaluate_integer(dock_station->handle,
> "_UID", NULL, &lbuf);
> if (ACPI_FAILURE(status))
> @@ -919,8 +915,7 @@ static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
> static ssize_t show_dock_type(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - struct dock_station *dock_station = *((struct dock_station **)
> - dev->platform_data);
> + struct dock_station *dock_station = dev->platform_data;
> char *type;
>
> if (dock_station->flags & DOCK_IS_DOCK)
> @@ -972,8 +967,8 @@ static int dock_add(acpi_handle handle)
> if (ret)
> goto err_free;
>
> - platform_device_add_data(dock_device, &ds,
> - sizeof(struct dock_station *));
> + platform_device_add_data(dock_device, ds,
> + sizeof(struct dock_station));
This patch isn't good. platform_device_add_data will malloc a new
'struct dock_station' and copy old to it, and later the two copy aren't
consistent. So NACK this one.
ACK other 5 patches.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
