All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: petkovbb@gmail.com
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org
Subject: Re: [PATCH] ide-floppy: remove struct idefloppy_id_gcw
Date: Sat, 9 Feb 2008 16:21:05 +0100	[thread overview]
Message-ID: <200802091621.05671.bzolnier@gmail.com> (raw)
In-Reply-To: <20080209080334.GA23177@gollum.tnic>

On Saturday 09 February 2008, Borislav Petkov wrote:
> commit a6aaf3dd3e88d1bd1e85fb4329042ecb9247e0eb
> Author: Borislav Petkov <petkovbb@gmail.com>
> Date:   Fri Feb 8 18:21:47 2008 +0100
> 
>     ide-floppy: remove struct idefloppy_id_gcw
>     
>     Signed-off-by: Borislav Petkov <petkovbb@gmail.com>

applied with some changes

> diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
> index faf22d7..5d5bde8 100644
> --- a/drivers/ide/ide-floppy.c
> +++ b/drivers/ide/ide-floppy.c

[...]

>  #ifdef CONFIG_PPC
>  	/* kludge for Apple PowerBook internal zip */
> -	if ((gcw.device_type == 5) &&
> -	    !strstr(id->model, "CD-ROM") &&
> -	    strstr(id->model, "ZIP"))
> -		gcw.device_type = 0;
> +	if ((device_type == 5) &&
> +		trstr(id->model, "CD-ROM") &&
                ^^^^^

[...]

> -	else if (!gcw.removable)
> -		printk(KERN_ERR "ide-floppy: The removable flag is not set\n");
> -	else if (gcw.drq_type == 3) {
> +				"to floppy\n", device_type);
> +	else if (!removable)
> +		printk(KERN_ERR "ide-floppy: The removable flag (0x%02x) is not"

no need to dump it (it is a single bit flag)

[ please document such changes in patch description ]

> +	else if (drq_type == 3) {
>  		printk(KERN_ERR "ide-floppy: Sorry, DRQ type (0x%02x) not "
> -				"supported\n", gcw.drq_type);
> -	} else if (gcw.packet_size != 0) {
> +				"supported\n", drq_type);
> +	} else if (packet_size != 0) {
>  		printk(KERN_ERR "ide-floppy: Packet size (0x%02x) is not 12 "
> -				"bytes long\n", gcw.packet_size);
> +				"bytes\n", packet_size);
>  	} else

needless braces can be removed while at it

      reply	other threads:[~2008-02-09 15:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-09  8:03 [PATCH] ide-floppy: remove struct idefloppy_id_gcw Borislav Petkov
2008-02-09 15:21 ` Bartlomiej Zolnierkiewicz [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200802091621.05671.bzolnier@gmail.com \
    --to=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=petkovbb@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.