[OPW,kernel] Staging: bcm: line over 80 characters in Bcmnet.c
diff mbox

Message ID 1381158599-3602-1-git-send-email-ebru.akagunduz@gmail.com
State Accepted
Headers show

Commit Message

Ebru Akagündüz Oct. 7, 2013, 3:09 p.m. UTC
Fix checkpatch.pl issues with line over 80 characters in Bcmnet.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
---
 drivers/staging/bcm/Bcmnet.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Josh Triplett Oct. 7, 2013, 7:27 p.m. UTC | #1
On Mon, Oct 07, 2013 at 06:09:59PM +0300, Ebru Akagunduz wrote:
> Fix checkpatch.pl issues with line over 80 characters in Bcmnet.c
> 
> Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
> ---
>  drivers/staging/bcm/Bcmnet.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
> index 4e470d4..a567894 100644
> --- a/drivers/staging/bcm/Bcmnet.c
> +++ b/drivers/staging/bcm/Bcmnet.c
> @@ -142,7 +142,8 @@ static void bcm_get_drvinfo(struct net_device *dev,
>  			    struct ethtool_drvinfo *info)
>  {
>  	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
> -	struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;
> +	struct bcm_interface_adapter *psIntfAdapter =
> +						Adapter->pvInterfaceAdapter;

I'd suggest just putting the assignment on a separate line from the
declaration, instead.

- Josh Triplett
Ebru Akagündüz Oct. 7, 2013, 7:43 p.m. UTC | #2
Thanks, I'll change it as your suggestion.
Greg Kroah-Hartman Oct. 7, 2013, 8:26 p.m. UTC | #3
On Mon, Oct 07, 2013 at 12:27:44PM -0700, Josh Triplett wrote:
> On Mon, Oct 07, 2013 at 06:09:59PM +0300, Ebru Akagunduz wrote:
> > Fix checkpatch.pl issues with line over 80 characters in Bcmnet.c
> > 
> > Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
> > ---
> >  drivers/staging/bcm/Bcmnet.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
> > index 4e470d4..a567894 100644
> > --- a/drivers/staging/bcm/Bcmnet.c
> > +++ b/drivers/staging/bcm/Bcmnet.c
> > @@ -142,7 +142,8 @@ static void bcm_get_drvinfo(struct net_device *dev,
> >  			    struct ethtool_drvinfo *info)
> >  {
> >  	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
> > -	struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;
> > +	struct bcm_interface_adapter *psIntfAdapter =
> > +						Adapter->pvInterfaceAdapter;
> 
> I'd suggest just putting the assignment on a separate line from the
> declaration, instead.

Nope, this version looks fine to me, and when you put it on a separate
line, it breaks the code (the next line needed it.)

So I'll take this version, thanks.

greg k-h
Josh Triplett Oct. 7, 2013, 8:42 p.m. UTC | #4
On Mon, Oct 07, 2013 at 01:26:09PM -0700, Greg KH wrote:
> On Mon, Oct 07, 2013 at 12:27:44PM -0700, Josh Triplett wrote:
> > On Mon, Oct 07, 2013 at 06:09:59PM +0300, Ebru Akagunduz wrote:
> > > Fix checkpatch.pl issues with line over 80 characters in Bcmnet.c
> > > 
> > > Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
> > > ---
> > >  drivers/staging/bcm/Bcmnet.c | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
> > > index 4e470d4..a567894 100644
> > > --- a/drivers/staging/bcm/Bcmnet.c
> > > +++ b/drivers/staging/bcm/Bcmnet.c
> > > @@ -142,7 +142,8 @@ static void bcm_get_drvinfo(struct net_device *dev,
> > >  			    struct ethtool_drvinfo *info)
> > >  {
> > >  	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
> > > -	struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;
> > > +	struct bcm_interface_adapter *psIntfAdapter =
> > > +						Adapter->pvInterfaceAdapter;
> > 
> > I'd suggest just putting the assignment on a separate line from the
> > declaration, instead.
> 
> Nope, this version looks fine to me, and when you put it on a separate
> line, it breaks the code (the next line needed it.)

Easy enough to fix the next line to use a separate assignment as well,
and put both assignments after both declarations.

> So I'll take this version, thanks.

Fair enough.

- Josh Triplett
Greg Kroah-Hartman Oct. 8, 2013, 1:39 a.m. UTC | #5
On Mon, Oct 07, 2013 at 06:09:59PM +0300, Ebru Akagunduz wrote:
> Fix checkpatch.pl issues with line over 80 characters in Bcmnet.c
> 
> Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>

Applied, thanks.

greg k-h

Patch
diff mbox

diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 4e470d4..a567894 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -142,7 +142,8 @@  static void bcm_get_drvinfo(struct net_device *dev,
 			    struct ethtool_drvinfo *info)
 {
 	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(dev);
-	struct bcm_interface_adapter *psIntfAdapter = Adapter->pvInterfaceAdapter;
+	struct bcm_interface_adapter *psIntfAdapter =
+						Adapter->pvInterfaceAdapter;
 	struct usb_device *udev = interface_to_usbdev(psIntfAdapter->interface);
 
 	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));