Fixed all CHECK: Alignment should match open parenthesis
and deleted the trailing whitespaces as reported by
checkpatch to adhere to the Linux kernel coding-style
guidelines.
Signed-off-by: Alexon Oliveira <[email protected]>
---
Changes in v2:
- Fixed changelog, noted by Greg KH
drivers/staging/vme_user/vme.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c
index 977c81e2f3c7..741593d75a63 100644
--- a/drivers/staging/vme_user/vme.c
+++ b/drivers/staging/vme_user/vme.c
@@ -563,7 +563,7 @@ EXPORT_SYMBOL(vme_master_request);
* returned.
*/
int vme_master_set(struct vme_resource *resource, int enabled,
- unsigned long long vme_base, unsigned long long size,
+ unsigned long long vme_base, unsigned long long size,
u32 aspace, u32 cycle, u32 dwidth)
{
struct vme_bridge *bridge = find_bridge(resource);
@@ -614,7 +614,7 @@ EXPORT_SYMBOL(vme_master_set);
* device or if an invalid resource has been provided.
*/
int vme_master_get(struct vme_resource *resource, int *enabled,
- unsigned long long *vme_base, unsigned long long *size,
+ unsigned long long *vme_base, unsigned long long *size,
u32 *aspace, u32 *cycle, u32 *dwidth)
{
struct vme_bridge *bridge = find_bridge(resource);
@@ -1045,7 +1045,7 @@ EXPORT_SYMBOL(vme_dma_pci_attribute);
* Return: Pointer to VME DMA attribute, NULL on failure.
*/
struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address,
- u32 aspace, u32 cycle,
+ u32 aspace, u32 cycle,
u32 dwidth)
{
struct vme_dma_attr *attributes;
@@ -1841,7 +1841,7 @@ EXPORT_SYMBOL(vme_unregister_bridge);
/* - Driver Registration --------------------------------------------------- */
static int __vme_register_driver_bus(struct vme_driver *drv,
- struct vme_bridge *bridge,
+ struct vme_bridge *bridge,
unsigned int ndevs)
{
int err;
--
2.41.0
On Mon, Aug 07, 2023 at 05:42:26PM -0300, Alexon Oliveira wrote:
> Fixed all CHECK: Alignment should match open parenthesis
> and deleted the trailing whitespaces as reported by
> checkpatch to adhere to the Linux kernel coding-style
> guidelines.
>
> Signed-off-by: Alexon Oliveira <[email protected]>
> ---
>
> Changes in v2:
> - Fixed changelog, noted by Greg KH
>
> drivers/staging/vme_user/vme.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c
> index 977c81e2f3c7..741593d75a63 100644
> --- a/drivers/staging/vme_user/vme.c
> +++ b/drivers/staging/vme_user/vme.c
> @@ -563,7 +563,7 @@ EXPORT_SYMBOL(vme_master_request);
> * returned.
> */
> int vme_master_set(struct vme_resource *resource, int enabled,
> - unsigned long long vme_base, unsigned long long size,
> + unsigned long long vme_base, unsigned long long size,
> u32 aspace, u32 cycle, u32 dwidth)
I think the confusion here is that my tree does NOT look like your tree
at all right now. If I try to apply this patch, I get:
checking file drivers/staging/vme_user/vme.c
Hunk #1 FAILED at 563.
Hunk #2 FAILED at 614.
Hunk #3 FAILED at 1045.
Hunk #4 FAILED at 1841.
4 out of 4 hunks FAILED
So please, rebase your tree against my staging.git on git.kernel.org
tree, the staging-next branch, and then resend the patches from that.
thanks,
greg k-h
On Tue, Aug 08, 2023 at 06:33:07AM +0200, Greg KH wrote:
> On Mon, Aug 07, 2023 at 05:42:26PM -0300, Alexon Oliveira wrote:
> > Fixed all CHECK: Alignment should match open parenthesis
> > and deleted the trailing whitespaces as reported by
> > checkpatch to adhere to the Linux kernel coding-style
> > guidelines.
> >
> > Signed-off-by: Alexon Oliveira <[email protected]>
> > ---
> >
> > Changes in v2:
> > - Fixed changelog, noted by Greg KH
> >
> > drivers/staging/vme_user/vme.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/vme_user/vme.c b/drivers/staging/vme_user/vme.c
> > index 977c81e2f3c7..741593d75a63 100644
> > --- a/drivers/staging/vme_user/vme.c
> > +++ b/drivers/staging/vme_user/vme.c
> > @@ -563,7 +563,7 @@ EXPORT_SYMBOL(vme_master_request);
> > * returned.
> > */
> > int vme_master_set(struct vme_resource *resource, int enabled,
> > - unsigned long long vme_base, unsigned long long size,
> > + unsigned long long vme_base, unsigned long long size,
> > u32 aspace, u32 cycle, u32 dwidth)
>
> I think the confusion here is that my tree does NOT look like your tree
> at all right now. If I try to apply this patch, I get:
>
> checking file drivers/staging/vme_user/vme.c
> Hunk #1 FAILED at 563.
> Hunk #2 FAILED at 614.
> Hunk #3 FAILED at 1045.
> Hunk #4 FAILED at 1841.
> 4 out of 4 hunks FAILED
>
> So please, rebase your tree against my staging.git on git.kernel.org
> tree, the staging-next branch, and then resend the patches from that.
>
Hmm, ACK. I always rebase before commit a new patch, but doing like
this:
$ git fetch origin
$ git rebase -i origin/staging-testing
I'll do it as you instructed.
> thanks,
>
> greg k-h
Thank you.
Alexon Oliveira