* [PATCH] drivers: firmware: edd: fixed coding style errors
@ 2013-12-22 21:17 Derek Perrin
2013-12-22 22:13 ` Joe Perches
0 siblings, 1 reply; 6+ messages in thread
From: Derek Perrin @ 2013-12-22 21:17 UTC (permalink / raw)
To: d.roc16; +Cc: linux-kernel
Fixed coding style errors. Spaces, tab and parenthesis errors.
Signed-off-by: Derek Perrin <d.roc16@gmail.com>
---
drivers/firmware/edd.c | 62 +++++++++++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index e229576..c3540d6 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -62,8 +62,8 @@ struct edd_device {
struct edd_attribute {
struct attribute attr;
- ssize_t(*show) (struct edd_device * edev, char *buf);
- int (*test) (struct edd_device * edev);
+ ssize_t(*show) (struct edd_device *edev, char *buf);
+ int (*test) (struct edd_device *edev);
};
/* forward declarations */
@@ -72,7 +72,7 @@ static struct pci_dev *edd_get_pci_dev(struct edd_device *edev);
static struct edd_device *edd_devices[EDD_MBR_SIG_MAX];
-#define EDD_DEVICE_ATTR(_name,_mode,_show,_test) \
+#define EDD_DEVICE_ATTR(_name, _mode, _show, _test) \
struct edd_attribute edd_attr_##_name = { \
.attr = {.name = __stringify(_name), .mode = _mode }, \
.show = _show, \
@@ -107,11 +107,11 @@ edd_dev_set_info(struct edd_device *edev, int i)
edev->info = &edd.edd_info[i];
}
-#define to_edd_attr(_attr) container_of(_attr,struct edd_attribute,attr)
-#define to_edd_device(obj) container_of(obj,struct edd_device,kobj)
+#define to_edd_attr(_attr) container_of(_attr, struct edd_attribute, attr)
+#define to_edd_device(obj) container_of(obj, struct edd_device, kobj)
static ssize_t
-edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
+edd_attr_show(struct kobject *kobj, struct attribute *attr, char *buf)
{
struct edd_device *dev = to_edd_device(kobj);
struct edd_attribute *edd_attr = to_edd_attr(attr);
@@ -169,7 +169,7 @@ edd_show_host_bus(struct edd_device *edev, char *buf)
p += scnprintf(p, left, "\tunknown: %llx\n",
info->params.interface_path.unknown.reserved);
}
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -228,7 +228,7 @@ edd_show_interface(struct edd_device *edev, char *buf)
info->params.device_path.unknown.reserved2);
}
- return (p - buf);
+ return p - buf;
}
/**
@@ -272,7 +272,7 @@ edd_show_version(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "0x%02x\n", info->version);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -280,7 +280,7 @@ edd_show_mbr_signature(struct edd_device *edev, char *buf)
{
char *p = buf;
p += scnprintf(p, left, "0x%08x\n", edev->mbr_signature);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -306,7 +306,7 @@ edd_show_extensions(struct edd_device *edev, char *buf)
if (info->interface_support & EDD_EXT_64BIT_EXTENSIONS) {
p += scnprintf(p, left, "64-bit extensions\n");
}
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -336,7 +336,7 @@ edd_show_info_flags(struct edd_device *edev, char *buf)
p += scnprintf(p, left, "no media present\n");
if (info->params.info_flags & EDD_INFO_USE_INT13_FN50)
p += scnprintf(p, left, "use int13 fn50\n");
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -351,7 +351,7 @@ edd_show_legacy_max_cylinder(struct edd_device *edev, char *buf)
return -EINVAL;
p += snprintf(p, left, "%u\n", info->legacy_max_cylinder);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -366,7 +366,7 @@ edd_show_legacy_max_head(struct edd_device *edev, char *buf)
return -EINVAL;
p += snprintf(p, left, "%u\n", info->legacy_max_head);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -381,7 +381,7 @@ edd_show_legacy_sectors_per_track(struct edd_device *edev, char *buf)
return -EINVAL;
p += snprintf(p, left, "%u\n", info->legacy_sectors_per_track);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -396,7 +396,7 @@ edd_show_default_cylinders(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%u\n", info->params.num_default_cylinders);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -411,7 +411,7 @@ edd_show_default_heads(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%u\n", info->params.num_default_heads);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -426,7 +426,7 @@ edd_show_default_sectors_per_track(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%u\n", info->params.sectors_per_track);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -441,7 +441,7 @@ edd_show_sectors(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%llu\n", info->params.number_of_sectors);
- return (p - buf);
+ return p - buf;
}
@@ -565,12 +565,12 @@ static EDD_DEVICE_ATTR(extensions, 0444, edd_show_extensions, edd_has_edd_info);
static EDD_DEVICE_ATTR(info_flags, 0444, edd_show_info_flags, edd_has_edd_info);
static EDD_DEVICE_ATTR(sectors, 0444, edd_show_sectors, edd_has_edd_info);
static EDD_DEVICE_ATTR(legacy_max_cylinder, 0444,
- edd_show_legacy_max_cylinder,
+ edd_show_legacy_max_cylinder,
edd_has_legacy_max_cylinder);
static EDD_DEVICE_ATTR(legacy_max_head, 0444, edd_show_legacy_max_head,
edd_has_legacy_max_head);
static EDD_DEVICE_ATTR(legacy_sectors_per_track, 0444,
- edd_show_legacy_sectors_per_track,
+ edd_show_legacy_sectors_per_track,
edd_has_legacy_sectors_per_track);
static EDD_DEVICE_ATTR(default_cylinders, 0444, edd_show_default_cylinders,
edd_has_default_cylinders);
@@ -587,12 +587,12 @@ static EDD_DEVICE_ATTR(mbr_signature, 0444, edd_show_mbr_signature, edd_has_mbr_
/* These are default attributes that are added for every edd
* device discovered. There are none.
*/
-static struct attribute * def_attrs[] = {
+static struct attribute *def_attrs[] = {
NULL,
};
/* These attributes are conditional and only added for some devices. */
-static struct edd_attribute * edd_attrs[] = {
+static struct edd_attribute *edd_attrs[] = {
&edd_attr_raw_data,
&edd_attr_version,
&edd_attr_extensions,
@@ -619,9 +619,9 @@ static struct edd_attribute * edd_attrs[] = {
* but just in case, we use the release callback anyway.
*/
-static void edd_release(struct kobject * kobj)
+static void edd_release(struct kobject *kobj)
{
- struct edd_device * dev = to_edd_device(kobj);
+ struct edd_device *dev = to_edd_device(kobj);
kfree(dev);
}
@@ -685,7 +685,7 @@ edd_create_symlink_to_pcidev(struct edd_device *edev)
int ret;
if (!pci_dev)
return 1;
- ret = sysfs_create_link(&edev->kobj,&pci_dev->dev.kobj,"pci_dev");
+ ret = sysfs_create_link(&edev->kobj, &pci_dev->dev.kobj, "pci_dev");
pci_dev_put(pci_dev);
return ret;
}
@@ -696,16 +696,16 @@ edd_device_unregister(struct edd_device *edev)
kobject_put(&edev->kobj);
}
-static void edd_populate_dir(struct edd_device * edev)
+static void edd_populate_dir(struct edd_device *edev)
{
- struct edd_attribute * attr;
+ struct edd_attribute *attr;
int error = 0;
int i;
for (i = 0; (attr = edd_attrs[i]) && !error; i++) {
if (!attr->test ||
(attr->test && attr->test(edev)))
- error = sysfs_create_file(&edev->kobj,&attr->attr);
+ error = sysfs_create_file(&edev->kobj, &attr->attr);
}
if (!error) {
@@ -745,7 +745,7 @@ static int __init
edd_init(void)
{
int i;
- int rc=0;
+ int rc = 0;
struct edd_device *edev;
printk(KERN_INFO "BIOS EDD facility v%s %s, %d devices found\n",
@@ -791,7 +791,7 @@ edd_exit(void)
struct edd_device *edev;
for (i = 0; i < edd_num_devices(); i++) {
- if ((edev = edd_devices[i]))
+ if ((edev == edd_devices[i]))
edd_device_unregister(edev);
}
kset_unregister(edd_kset);
--
1.8.5.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drivers: firmware: edd: fixed coding style errors
2013-12-22 21:17 [PATCH] drivers: firmware: edd: fixed coding style errors Derek Perrin
@ 2013-12-22 22:13 ` Joe Perches
2013-12-24 0:53 ` Derek Perrin
0 siblings, 1 reply; 6+ messages in thread
From: Joe Perches @ 2013-12-22 22:13 UTC (permalink / raw)
To: Derek Perrin; +Cc: linux-kernel
On Sun, 2013-12-22 at 15:17 -0600, Derek Perrin wrote:
> Fixed coding style errors. Spaces, tab and parenthesis errors.
There's a real error in this patch.
When you do whitespace only changes, please
verify that the old and new object files produced
are unchanged.
One trivial bit too,
> diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
[]
> @@ -62,8 +62,8 @@ struct edd_device {
>
> struct edd_attribute {
> struct attribute attr;
> - ssize_t(*show) (struct edd_device * edev, char *buf);
> - int (*test) (struct edd_device * edev);
> + ssize_t(*show) (struct edd_device *edev, char *buf);
> + int (*test) (struct edd_device *edev);
I think most prefer function pointer prototypes like:
size_t (*show)(struct edd_device *edev, char *buf);
int (*test)(struct edd_device *edev);
> @@ -791,7 +791,7 @@ edd_exit(void)
> struct edd_device *edev;
>
> for (i = 0; i < edd_num_devices(); i++) {
> - if ((edev = edd_devices[i]))
> + if ((edev == edd_devices[i]))
> edd_device_unregister(edev);
> }
> kset_unregister(edd_kset);
This is wrong.
It's an assignment in the block and it's important.
This could be rewritten as:
for (i = 0; i < edd_num_devices(); i++) {
edev = edd_devices[i];
if (edev)
edd_device_unregister(edev);
}
or just remove the temporary.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drivers: firmware: edd: fixed coding style errors
2013-12-22 22:13 ` Joe Perches
@ 2013-12-24 0:53 ` Derek Perrin
2013-12-24 6:43 ` Joe Perches
0 siblings, 1 reply; 6+ messages in thread
From: Derek Perrin @ 2013-12-24 0:53 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-kernel
On Sunday, December 22, 2013 02:13:39 PM Joe Perches wrote:
> On Sun, 2013-12-22 at 15:17 -0600, Derek Perrin wrote:
> > Fixed coding style errors. Spaces, tab and parenthesis errors.
>
> There's a real error in this patch.
>
> When you do whitespace only changes, please
> verify that the old and new object files produced
> are unchanged.
>
> One trivial bit too,
>
> > diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
>
> []
>
> > @@ -62,8 +62,8 @@ struct edd_device {
> >
> > struct edd_attribute {
> >
> > struct attribute attr;
> >
> > - ssize_t(*show) (struct edd_device * edev, char *buf);
> > - int (*test) (struct edd_device * edev);
> > + ssize_t(*show) (struct edd_device *edev, char *buf);
> > + int (*test) (struct edd_device *edev);
>
> I think most prefer function pointer prototypes like:
>
> size_t (*show)(struct edd_device *edev, char *buf);
> int (*test)(struct edd_device *edev);
>
> > @@ -791,7 +791,7 @@ edd_exit(void)
> >
> > struct edd_device *edev;
> >
> > for (i = 0; i < edd_num_devices(); i++) {
> >
> > - if ((edev = edd_devices[i]))
> > + if ((edev == edd_devices[i]))
> >
> > edd_device_unregister(edev);
> >
> > }
> > kset_unregister(edd_kset);
>
> This is wrong.
> It's an assignment in the block and it's important.
>
> This could be rewritten as:
>
> for (i = 0; i < edd_num_devices(); i++) {
> edev = edd_devices[i];
> if (edev)
> edd_device_unregister(edev);
> }
>
> or just remove the temporary.
Sorry, I'm really new to contributing to the kernel and just learning the
process. I can make a new patch that fixes the assignment. I'm not seeing any
difference between what I did and what you said about the function pointer
prototypes.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drivers: firmware: edd: fixed coding style errors
2013-12-24 0:53 ` Derek Perrin
@ 2013-12-24 6:43 ` Joe Perches
2013-12-25 10:19 ` [PATCH v2] " Derek Perrin
0 siblings, 1 reply; 6+ messages in thread
From: Joe Perches @ 2013-12-24 6:43 UTC (permalink / raw)
To: Derek Perrin; +Cc: linux-kernel
On Mon, 2013-12-23 at 18:53 -0600, Derek Perrin wrote:
> On Sunday, December 22, 2013 02:13:39 PM Joe Perches wrote:
> > On Sun, 2013-12-22 at 15:17 -0600, Derek Perrin wrote:
[]
> > One trivial bit too,
> > > diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
[]
> > > - ssize_t(*show) (struct edd_device * edev, char *buf);
> > > - int (*test) (struct edd_device * edev);
> > > + ssize_t(*show) (struct edd_device *edev, char *buf);
> > > + int (*test) (struct edd_device *edev);
> >
> > I think most prefer function pointer prototypes like:
> >
> > size_t (*show)(struct edd_device *edev, char *buf);
> > int (*test)(struct edd_device *edev);
> I'm not seeing any
> difference between what I did and what you said about the function pointer
> prototypes.
type (*funcptr) (args...)
vs
type (*funcptr)(args...)
2nd is preferred
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] drivers: firmware: edd: fixed coding style errors.
2013-12-24 6:43 ` Joe Perches
@ 2013-12-25 10:19 ` Derek Perrin
2013-12-25 5:21 ` [PATCH] checkpatch: Add tests for function pointer style misuses Joe Perches
0 siblings, 1 reply; 6+ messages in thread
From: Derek Perrin @ 2013-12-25 10:19 UTC (permalink / raw)
To: joe; +Cc: linux-kernel, Derek Perrin
Fixed coding style errors. Fixed spacing, tab and parenthesis errors.
Signed-off-by: Derek Perrin <d.roc16@gmail.com>
---
Changes since v1:
*cleaned up all checkpatch.pl errors
*changed function pointer prototype to preferred style from Joe Perches
*fixed edd_device *edev assignment in if condition
drivers/firmware/edd.c | 63 +++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 31 deletions(-)
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index e229576..0e93659 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -62,8 +62,8 @@ struct edd_device {
struct edd_attribute {
struct attribute attr;
- ssize_t(*show) (struct edd_device * edev, char *buf);
- int (*test) (struct edd_device * edev);
+ ssize_t(*show)(struct edd_device *edev, char *buf);
+ int (*test)(struct edd_device *edev);
};
/* forward declarations */
@@ -72,7 +72,7 @@ static struct pci_dev *edd_get_pci_dev(struct edd_device *edev);
static struct edd_device *edd_devices[EDD_MBR_SIG_MAX];
-#define EDD_DEVICE_ATTR(_name,_mode,_show,_test) \
+#define EDD_DEVICE_ATTR(_name, _mode, _show, _test) \
struct edd_attribute edd_attr_##_name = { \
.attr = {.name = __stringify(_name), .mode = _mode }, \
.show = _show, \
@@ -107,11 +107,11 @@ edd_dev_set_info(struct edd_device *edev, int i)
edev->info = &edd.edd_info[i];
}
-#define to_edd_attr(_attr) container_of(_attr,struct edd_attribute,attr)
-#define to_edd_device(obj) container_of(obj,struct edd_device,kobj)
+#define to_edd_attr(_attr) container_of(_attr, struct edd_attribute, attr)
+#define to_edd_device(obj) container_of(obj, struct edd_device, kobj)
static ssize_t
-edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
+edd_attr_show(struct kobject *kobj, struct attribute *attr, char *buf)
{
struct edd_device *dev = to_edd_device(kobj);
struct edd_attribute *edd_attr = to_edd_attr(attr);
@@ -169,7 +169,7 @@ edd_show_host_bus(struct edd_device *edev, char *buf)
p += scnprintf(p, left, "\tunknown: %llx\n",
info->params.interface_path.unknown.reserved);
}
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -228,7 +228,7 @@ edd_show_interface(struct edd_device *edev, char *buf)
info->params.device_path.unknown.reserved2);
}
- return (p - buf);
+ return p - buf;
}
/**
@@ -272,7 +272,7 @@ edd_show_version(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "0x%02x\n", info->version);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -280,7 +280,7 @@ edd_show_mbr_signature(struct edd_device *edev, char *buf)
{
char *p = buf;
p += scnprintf(p, left, "0x%08x\n", edev->mbr_signature);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -306,7 +306,7 @@ edd_show_extensions(struct edd_device *edev, char *buf)
if (info->interface_support & EDD_EXT_64BIT_EXTENSIONS) {
p += scnprintf(p, left, "64-bit extensions\n");
}
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -336,7 +336,7 @@ edd_show_info_flags(struct edd_device *edev, char *buf)
p += scnprintf(p, left, "no media present\n");
if (info->params.info_flags & EDD_INFO_USE_INT13_FN50)
p += scnprintf(p, left, "use int13 fn50\n");
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -351,7 +351,7 @@ edd_show_legacy_max_cylinder(struct edd_device *edev, char *buf)
return -EINVAL;
p += snprintf(p, left, "%u\n", info->legacy_max_cylinder);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -366,7 +366,7 @@ edd_show_legacy_max_head(struct edd_device *edev, char *buf)
return -EINVAL;
p += snprintf(p, left, "%u\n", info->legacy_max_head);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -381,7 +381,7 @@ edd_show_legacy_sectors_per_track(struct edd_device *edev, char *buf)
return -EINVAL;
p += snprintf(p, left, "%u\n", info->legacy_sectors_per_track);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -396,7 +396,7 @@ edd_show_default_cylinders(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%u\n", info->params.num_default_cylinders);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -411,7 +411,7 @@ edd_show_default_heads(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%u\n", info->params.num_default_heads);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -426,7 +426,7 @@ edd_show_default_sectors_per_track(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%u\n", info->params.sectors_per_track);
- return (p - buf);
+ return p - buf;
}
static ssize_t
@@ -441,7 +441,7 @@ edd_show_sectors(struct edd_device *edev, char *buf)
return -EINVAL;
p += scnprintf(p, left, "%llu\n", info->params.number_of_sectors);
- return (p - buf);
+ return p - buf;
}
@@ -565,12 +565,12 @@ static EDD_DEVICE_ATTR(extensions, 0444, edd_show_extensions, edd_has_edd_info);
static EDD_DEVICE_ATTR(info_flags, 0444, edd_show_info_flags, edd_has_edd_info);
static EDD_DEVICE_ATTR(sectors, 0444, edd_show_sectors, edd_has_edd_info);
static EDD_DEVICE_ATTR(legacy_max_cylinder, 0444,
- edd_show_legacy_max_cylinder,
+ edd_show_legacy_max_cylinder,
edd_has_legacy_max_cylinder);
static EDD_DEVICE_ATTR(legacy_max_head, 0444, edd_show_legacy_max_head,
edd_has_legacy_max_head);
static EDD_DEVICE_ATTR(legacy_sectors_per_track, 0444,
- edd_show_legacy_sectors_per_track,
+ edd_show_legacy_sectors_per_track,
edd_has_legacy_sectors_per_track);
static EDD_DEVICE_ATTR(default_cylinders, 0444, edd_show_default_cylinders,
edd_has_default_cylinders);
@@ -587,12 +587,12 @@ static EDD_DEVICE_ATTR(mbr_signature, 0444, edd_show_mbr_signature, edd_has_mbr_
/* These are default attributes that are added for every edd
* device discovered. There are none.
*/
-static struct attribute * def_attrs[] = {
+static struct attribute *def_attrs[] = {
NULL,
};
/* These attributes are conditional and only added for some devices. */
-static struct edd_attribute * edd_attrs[] = {
+static struct edd_attribute *edd_attrs[] = {
&edd_attr_raw_data,
&edd_attr_version,
&edd_attr_extensions,
@@ -619,9 +619,9 @@ static struct edd_attribute * edd_attrs[] = {
* but just in case, we use the release callback anyway.
*/
-static void edd_release(struct kobject * kobj)
+static void edd_release(struct kobject *kobj)
{
- struct edd_device * dev = to_edd_device(kobj);
+ struct edd_device *dev = to_edd_device(kobj);
kfree(dev);
}
@@ -685,7 +685,7 @@ edd_create_symlink_to_pcidev(struct edd_device *edev)
int ret;
if (!pci_dev)
return 1;
- ret = sysfs_create_link(&edev->kobj,&pci_dev->dev.kobj,"pci_dev");
+ ret = sysfs_create_link(&edev->kobj, &pci_dev->dev.kobj, "pci_dev");
pci_dev_put(pci_dev);
return ret;
}
@@ -696,16 +696,16 @@ edd_device_unregister(struct edd_device *edev)
kobject_put(&edev->kobj);
}
-static void edd_populate_dir(struct edd_device * edev)
+static void edd_populate_dir(struct edd_device *edev)
{
- struct edd_attribute * attr;
+ struct edd_attribute *attr;
int error = 0;
int i;
for (i = 0; (attr = edd_attrs[i]) && !error; i++) {
if (!attr->test ||
(attr->test && attr->test(edev)))
- error = sysfs_create_file(&edev->kobj,&attr->attr);
+ error = sysfs_create_file(&edev->kobj, &attr->attr);
}
if (!error) {
@@ -745,7 +745,7 @@ static int __init
edd_init(void)
{
int i;
- int rc=0;
+ int rc = 0;
struct edd_device *edev;
printk(KERN_INFO "BIOS EDD facility v%s %s, %d devices found\n",
@@ -791,7 +791,8 @@ edd_exit(void)
struct edd_device *edev;
for (i = 0; i < edd_num_devices(); i++) {
- if ((edev = edd_devices[i]))
+ edev = edd_devices[i];
+ if (edev)
edd_device_unregister(edev);
}
kset_unregister(edd_kset);
--
1.8.5.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] checkpatch: Add tests for function pointer style misuses
2013-12-25 10:19 ` [PATCH v2] " Derek Perrin
@ 2013-12-25 5:21 ` Joe Perches
0 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2013-12-25 5:21 UTC (permalink / raw)
To: Andrew Morton, Andy Whitcroft; +Cc: linux-kernel, Derek Perrin
Kernel style uses function pointers in this form:
"type (*funcptr)(args...)"
Emit warnings when this function pointer form isn't used.
Signed-off-by: Joe Perches <joe@perches.com>
---
scripts/checkpatch.pl | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 0fcbc5f..f5d4560 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2810,6 +2810,65 @@ sub process {
}
}
+# Function pointer declarations
+# check spacing between type, funcptr, and args
+# canonical declaration is "type (*funcptr)(args...)"
+#
+# the $Declare variable will capture all spaces after the type
+# so check it for trailing missing spaces or multiple spaces
+ if ($line =~ /^.\s*($Declare)\((\s*)\*(\s*)$Ident(\s*)\)(\s*)\(/) {
+ my $declare = $1;
+ my $pre_pointer_space = $2;
+ my $post_pointer_space = $3;
+ my $funcname = $4;
+ my $post_funcname_space = $5;
+ my $pre_args_space = $6;
+
+ if ($declare !~ /\s$/) {
+ WARN("SPACING",
+ "missing space after return type\n" . $herecurr);
+ }
+
+# unnecessary space "type (*funcptr)(args...)"
+ elsif ($declare =~ /\s{2,}$/) {
+ WARN("SPACING",
+ "Multiple spaces after return type\n" . $herecurr);
+ }
+
+# unnecessary space "type ( *funcptr)(args...)"
+ if (defined $pre_pointer_space &&
+ $pre_pointer_space =~ /^\s/) {
+ WARN("SPACING",
+ "Unnecessary space after function pointer open parenthesis\n" . $herecurr);
+ }
+
+# unnecessary space "type (* funcptr)(args...)"
+ if (defined $post_pointer_space &&
+ $post_pointer_space =~ /^\s/) {
+ WARN("SPACING",
+ "Unnecessary space before function pointer name\n" . $herecurr);
+ }
+
+# unnecessary space "type (*funcptr )(args...)"
+ if (defined $post_funcname_space &&
+ $post_funcname_space =~ /^\s/) {
+ WARN("SPACING",
+ "Unnecessary space after function pointer name\n" . $herecurr);
+ }
+
+# unnecessary space "type (*funcptr) (args...)"
+ if (defined $pre_args_space &&
+ $pre_args_space =~ /^\s/) {
+ WARN("SPACING",
+ "Unnecessary space before function pointer arguments\n" . $herecurr);
+ }
+
+ if (show_type("SPACING") && $fix) {
+ $fixed[$linenr - 1] =~
+ s/^(.\s*$Declare)\(\s*\*\s*($Ident)\s*\)\s*\(/rtrim($1) . " " . "\(\*$2\)\("/ex;
+ }
+ }
+
# check for spacing round square brackets; allowed:
# 1. with a type on the left -- int [] a;
# 2. at the beginning of a line for slice initialisers -- [0...10] = 5,
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-25 5:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-22 21:17 [PATCH] drivers: firmware: edd: fixed coding style errors Derek Perrin
2013-12-22 22:13 ` Joe Perches
2013-12-24 0:53 ` Derek Perrin
2013-12-24 6:43 ` Joe Perches
2013-12-25 10:19 ` [PATCH v2] " Derek Perrin
2013-12-25 5:21 ` [PATCH] checkpatch: Add tests for function pointer style misuses Joe Perches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.