2008-06-27 23:04:43

by Bjorn Helgaas

Subject: [patch 11/28] PNP: whitespace/coding style fixes

No functional change; just make a couple declarations
consistent with the rest of the file.

Signed-off-by: Bjorn Helgaas <[email protected]>
Acked-by: Rene Herman <[email protected]>

Index: work10/drivers/pnp/interface.c
===================================================================
--- work10.orig/drivers/pnp/interface.c 2008-05-09 14:42:25.000000000 -0600
+++ work10/drivers/pnp/interface.c 2008-05-09 14:45:57.000000000 -0600
@@ -216,12 +216,12 @@ static ssize_t pnp_show_options(struct d
struct device_attribute *attr, char *buf)
{
struct pnp_dev *dev = to_pnp_dev(dmdev);
+ pnp_info_buffer_t *buffer;
struct pnp_option *independent = dev->independent;
struct pnp_option *dependent = dev->dependent;
int ret, dep = 1;

- pnp_info_buffer_t *buffer = (pnp_info_buffer_t *)
- pnp_alloc(sizeof(pnp_info_buffer_t));
+ buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
if (!buffer)
return -ENOMEM;

@@ -248,17 +248,18 @@ static ssize_t pnp_show_current_resource
char *buf)
{
struct pnp_dev *dev = to_pnp_dev(dmdev);
+ pnp_info_buffer_t *buffer;
struct pnp_resource *pnp_res;
struct resource *res;
int ret;
- pnp_info_buffer_t *buffer;

if (!dev)
return -EINVAL;

- buffer = (pnp_info_buffer_t *) pnp_alloc(sizeof(pnp_info_buffer_t));
+ buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
if (!buffer)
return -ENOMEM;
+
buffer->len = PAGE_SIZE;
buffer->buffer = buf;
buffer->curr = buffer->buffer;
@@ -295,9 +296,9 @@ static ssize_t pnp_show_current_resource
return ret;
}

-static ssize_t
-pnp_set_current_resources(struct device *dmdev, struct device_attribute *attr,
- const char *ubuf, size_t count)
+static ssize_t pnp_set_current_resources(struct device *dmdev,
+ struct device_attribute *attr,
+ const char *ubuf, size_t count)
{
struct pnp_dev *dev = to_pnp_dev(dmdev);
char *buf = (void *)ubuf;

--

2008-06-28 19:57:22

by Joe Perches

Subject: Re: [patch 11/28] PNP: whitespace/coding style fixes

On Fri, 2008-06-27 at 16:57 -0600, Bjorn Helgaas wrote:
> Index: work10/drivers/pnp/interface.c
> ===================================================================
> --- work10.orig/drivers/pnp/interface.c 2008-05-09 14:42:25.000000000 -0600
> +++ work10/drivers/pnp/interface.c 2008-05-09 14:45:57.000000000 -0600
> @@ -216,12 +216,12 @@ static ssize_t pnp_show_options(struct d
> struct device_attribute *attr, char *buf)
> {
> struct pnp_dev *dev = to_pnp_dev(dmdev);
> + pnp_info_buffer_t *buffer;
> struct pnp_option *independent = dev->independent;
> struct pnp_option *dependent = dev->dependent;
> int ret, dep = 1;
>
> - pnp_info_buffer_t *buffer = (pnp_info_buffer_t *)
> - pnp_alloc(sizeof(pnp_info_buffer_t));
> + buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
> if (!buffer)
> return -ENOMEM;

Wouldn't it be nicer without the unnecessary cast?

pnp_info_buffer_t *buffer = pnp_alloc(sizeof(*buffer));

2008-06-28 20:02:16

by Rene Herman

Subject: Re: [patch 11/28] PNP: whitespace/coding style fixes

On 28-06-08 21:56, Joe Perches wrote:
> On Fri, 2008-06-27 at 16:57 -0600, Bjorn Helgaas wrote:
>> Index: work10/drivers/pnp/interface.c
>> ===================================================================
>> --- work10.orig/drivers/pnp/interface.c 2008-05-09 14:42:25.000000000 -0600
>> +++ work10/drivers/pnp/interface.c 2008-05-09 14:45:57.000000000 -0600
>> @@ -216,12 +216,12 @@ static ssize_t pnp_show_options(struct d
>> struct device_attribute *attr, char *buf)
>> {
>> struct pnp_dev *dev = to_pnp_dev(dmdev);
>> + pnp_info_buffer_t *buffer;
>> struct pnp_option *independent = dev->independent;
>> struct pnp_option *dependent = dev->dependent;
>> int ret, dep = 1;
>>
>> - pnp_info_buffer_t *buffer = (pnp_info_buffer_t *)
>> - pnp_alloc(sizeof(pnp_info_buffer_t));
>> + buffer = pnp_alloc(sizeof(pnp_info_buffer_t));
>> if (!buffer)
>> return -ENOMEM;
>
> Wouldn't it be nicer without the unnecessary cast?
>
> pnp_info_buffer_t *buffer = pnp_alloc(sizeof(*buffer));

He deleted the cast (the sizeof(type) versus sizeof(var) thing is mostly
personal preference).

Rene.