First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
but added new warnings in the process. This patch is intended to fixed them all,
on lines 133, 142, 144, 145 and 173.
Signed-off-by: Alexon Oliveira <[email protected]>
---
Changes in v2:
- Fixed 3 different line lengths exceeding 100 columns, noted by Greg KH and Dan Carpenter
- Fixed 1 line with alignment matching open parenthesis
- Fixed 1 line to not end with a '('
Changes in v1:
- Fixed 11 different lines with alignment matching open parenthesis
drivers/staging/vme_user/vme_bridge.h | 46 +++++++++++----------------
1 file changed, 18 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/vme_user/vme_bridge.h b/drivers/staging/vme_user/vme_bridge.h
index 11df0a5e7f7b..9bdc41bb6602 100644
--- a/drivers/staging/vme_user/vme_bridge.h
+++ b/drivers/staging/vme_user/vme_bridge.h
@@ -128,28 +128,24 @@ struct vme_bridge {
struct mutex irq_mtx;
/* Slave Functions */
- int (*slave_get)(struct vme_slave_resource *, int *,
- unsigned long long *, unsigned long long *, dma_addr_t *,
- u32 *, u32 *);
+ int (*slave_get)(struct vme_slave_resource *, int *, unsigned long long *,
+ unsigned long long *, dma_addr_t *, u32 *, u32 *);
int (*slave_set)(struct vme_slave_resource *, int, unsigned long long,
- unsigned long long, dma_addr_t, u32, u32);
+ unsigned long long, dma_addr_t, u32, u32);
/* Master Functions */
- int (*master_get)(struct vme_master_resource *, int *,
- unsigned long long *, unsigned long long *, u32 *, u32 *,
- u32 *);
- int (*master_set)(struct vme_master_resource *, int,
- unsigned long long, unsigned long long, u32, u32, u32);
- ssize_t (*master_read)(struct vme_master_resource *, void *, size_t,
- loff_t);
- ssize_t (*master_write)(struct vme_master_resource *, void *, size_t,
- loff_t);
+ int (*master_get)(struct vme_master_resource *, int *, unsigned long long *,
+ unsigned long long *, u32 *, u32 *, u32 *);
+ int (*master_set)(struct vme_master_resource *, int, unsigned long long,
+ unsigned long long, u32, u32, u32);
+ ssize_t (*master_read)(struct vme_master_resource *, void *, size_t, loff_t);
+ ssize_t (*master_write)(struct vme_master_resource *, void *, size_t, loff_t);
unsigned int (*master_rmw)(struct vme_master_resource *, unsigned int,
- unsigned int, unsigned int, loff_t);
+ unsigned int, unsigned int, loff_t);
/* DMA Functions */
int (*dma_list_add)(struct vme_dma_list *, struct vme_dma_attr *,
- struct vme_dma_attr *, size_t);
+ struct vme_dma_attr *, size_t);
int (*dma_list_exec)(struct vme_dma_list *);
int (*dma_list_empty)(struct vme_dma_list *);
@@ -159,32 +155,26 @@ struct vme_bridge {
/* Location monitor functions */
int (*lm_set)(struct vme_lm_resource *, unsigned long long, u32, u32);
- int (*lm_get)(struct vme_lm_resource *, unsigned long long *, u32 *,
- u32 *);
- int (*lm_attach)(struct vme_lm_resource *, int,
- void (*callback)(void *), void *);
+ int (*lm_get)(struct vme_lm_resource *, unsigned long long *, u32 *, u32 *);
+ int (*lm_attach)(struct vme_lm_resource *, int, void (*callback)(void *), void *);
int (*lm_detach)(struct vme_lm_resource *, int);
/* CR/CSR space functions */
int (*slot_get)(struct vme_bridge *);
/* Bridge parent interface */
- void *(*alloc_consistent)(struct device *dev, size_t size,
- dma_addr_t *dma);
- void (*free_consistent)(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma);
+ void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *dma);
+ void (*free_consistent)(struct device *dev, size_t size, void *vaddr, dma_addr_t dma);
};
-void vme_bus_error_handler(struct vme_bridge *bridge,
- unsigned long long address, int am);
+void vme_bus_error_handler(struct vme_bridge *bridge, unsigned long long address, int am);
void vme_irq_handler(struct vme_bridge *, int, int);
struct vme_bridge *vme_init_bridge(struct vme_bridge *);
int vme_register_bridge(struct vme_bridge *);
void vme_unregister_bridge(struct vme_bridge *);
-struct vme_error_handler *vme_register_error_handler(
- struct vme_bridge *bridge, u32 aspace,
- unsigned long long address, size_t len);
+struct vme_error_handler *vme_register_error_handler(struct vme_bridge *bridge, u32 aspace,
+ unsigned long long address, size_t len);
void vme_unregister_error_handler(struct vme_error_handler *handler);
#endif /* _VME_BRIDGE_H_ */
--
2.41.0
On Tue, Aug 01, 2023 at 01:17:07PM -0300, Alexon Oliveira wrote:
> First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
> but added new warnings in the process. This patch is intended to fixed them all,
> on lines 133, 142, 144, 145 and 173.
Patches are stand-alone, we have no idea what "First patch" is.
Please look at the commit log for this file, or for all of
drivers/staging:
git log drivers/staging/
and get an idea of what changelog text should look like.
thanks,
greg k-h
On Tue, Aug 01, 2023 at 01:17:07PM -0300, Alexon Oliveira wrote:
> First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
> but added new warnings in the process. This patch is intended to fixed them all,
> on lines 133, 142, 144, 145 and 173.
>
Since you're going to be re-writing the commit message anyway, please
leave off the line numbers. Line numbers are not really useful. Just
say:
Fix the checkpatch warnings which complain about "CHECK: Alignment
should match open parenthesis".
regards,
dan carpenter
On Fri, Aug 04, 2023 at 03:23:17PM +0200, Greg KH wrote:
> On Tue, Aug 01, 2023 at 01:17:07PM -0300, Alexon Oliveira wrote:
> > First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
> > but added new warnings in the process. This patch is intended to fixed them all,
> > on lines 133, 142, 144, 145 and 173.
>
> Patches are stand-alone, we have no idea what "First patch" is.
>
That was just me being verbose and given more details related to the
v1 of this patch. I apologize. Nevermind that. What is worth is below
the ---
> Please look at the commit log for this file, or for all of
> drivers/staging:
> git log drivers/staging/
> and get an idea of what changelog text should look like.
>
ACK. So the correct changelog should be:
staging: vme_user: fix check alignment should match open parenthesis
Fixed the following as reported by checkpatch to adhere to the
Linux kernel coding-style guidelines.
Changes in v2:
- Fixed CHECK: line length exceeds 100 columns, noted by Greg KH and Dan Carpenter
- Fixed CHECK: Alignment should match open parenthesis
- Fixed CHECK: Lines should not end with a '('
Changes in v1:
- Fixed CHECK: Alignment should match open parenthesis
Signed-off-by: Alexon Oliveira <[email protected]>
>
> thanks,
>
> greg k-h
Thank you.
Alexon Oliveira
On Fri, Aug 04, 2023 at 11:07:36AM -0300, Alexon Oliveira wrote:
> On Fri, Aug 04, 2023 at 03:23:17PM +0200, Greg KH wrote:
> > On Tue, Aug 01, 2023 at 01:17:07PM -0300, Alexon Oliveira wrote:
> > > First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
> > > but added new warnings in the process. This patch is intended to fixed them all,
> > > on lines 133, 142, 144, 145 and 173.
> >
> > Patches are stand-alone, we have no idea what "First patch" is.
> >
>
> That was just me being verbose and given more details related to the
> v1 of this patch. I apologize. Nevermind that. What is worth is below
> the ---
>
> > Please look at the commit log for this file, or for all of
> > drivers/staging:
> > git log drivers/staging/
> > and get an idea of what changelog text should look like.
> >
>
> ACK. So the correct changelog should be:
>
> staging: vme_user: fix check alignment should match open parenthesis
>
> Fixed the following as reported by checkpatch to adhere to the
> Linux kernel coding-style guidelines.
>
> Changes in v2:
> - Fixed CHECK: line length exceeds 100 columns, noted by Greg KH and Dan Carpenter
> - Fixed CHECK: Alignment should match open parenthesis
> - Fixed CHECK: Lines should not end with a '('
This v2 changelogs go under the --- cut off line under the Signed-off-by
section.
>
> Changes in v1:
> - Fixed CHECK: Alignment should match open parenthesis
No one is going to NAK your patch for saying this but to talk about
changes in v1 doesn't make sense.
The new patch will be v3.
regards,
dan carpenter
On Fri, Aug 04, 2023 at 04:46:00PM +0300, Dan Carpenter wrote:
> On Tue, Aug 01, 2023 at 01:17:07PM -0300, Alexon Oliveira wrote:
> > First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
> > but added new warnings in the process. This patch is intended to fixed them all,
> > on lines 133, 142, 144, 145 and 173.
> >
>
> Since you're going to be re-writing the commit message anyway, please
> leave off the line numbers. Line numbers are not really useful. Just
> say:
>
> Fix the checkpatch warnings which complain about "CHECK: Alignment
> should match open parenthesis".
>
ACK. I was doing exactly that (in the previous message I just sent)
before I saw your message. I'm on my way to a new commit in a few
minutes with this update.
> regards,
> dan carpenter
>
Thank you.
Alexon Oliveira.
On Fri, Aug 04, 2023 at 05:11:29PM +0300, Dan Carpenter wrote:
> On Fri, Aug 04, 2023 at 11:07:36AM -0300, Alexon Oliveira wrote:
> > On Fri, Aug 04, 2023 at 03:23:17PM +0200, Greg KH wrote:
> > > On Tue, Aug 01, 2023 at 01:17:07PM -0300, Alexon Oliveira wrote:
> > > > First patch was intended to fix all "CHECK: Alignment should match open parenthesis",
> > > > but added new warnings in the process. This patch is intended to fixed them all,
> > > > on lines 133, 142, 144, 145 and 173.
> > >
> > > Patches are stand-alone, we have no idea what "First patch" is.
> > >
> >
> > That was just me being verbose and given more details related to the
> > v1 of this patch. I apologize. Nevermind that. What is worth is below
> > the ---
> >
> > > Please look at the commit log for this file, or for all of
> > > drivers/staging:
> > > git log drivers/staging/
> > > and get an idea of what changelog text should look like.
> > >
> >
> > ACK. So the correct changelog should be:
> >
> > staging: vme_user: fix check alignment should match open parenthesis
> >
> > Fixed the following as reported by checkpatch to adhere to the
> > Linux kernel coding-style guidelines.
> >
> > Changes in v2:
> > - Fixed CHECK: line length exceeds 100 columns, noted by Greg KH and Dan Carpenter
> > - Fixed CHECK: Alignment should match open parenthesis
> > - Fixed CHECK: Lines should not end with a '('
>
> This v2 changelogs go under the --- cut off line under the Signed-off-by
> section.
>
> >
> > Changes in v1:
> > - Fixed CHECK: Alignment should match open parenthesis
>
> No one is going to NAK your patch for saying this but to talk about
> changes in v1 doesn't make sense.
>
> The new patch will be v3.
>
ACK. Thank you for the heads up. Writing the v3 now.
> regards,
> dan carpenter
>
Thank you.
Alexon Oliveira