Re: [PATCH 28/31] swim: Clean up whitespace

Le 16/07/2026 à 12:02, Finn Thain a écrit :
> No functional changes.
> 
> Signed-off-by: Finn Thain <[email protected]>
> ---
>   drivers/block/swim.c     | 46 +++++++++++++++++++++-------------------
>   drivers/block/swim_asm.S | 15 ++-----------
>   2 files changed, 26 insertions(+), 35 deletions(-)

Reviewed-by: Laurent Vivier <[email protected]>

> 
> diff --git a/drivers/block/swim.c b/drivers/block/swim.c
> index 9661d8f7a5ed..406792952e7f 100644
> --- a/drivers/block/swim.c
> +++ b/drivers/block/swim.c
> @@ -2,7 +2,7 @@
>   /*
>    * Driver for SWIM (Sander Woz Integrated Machine) floppy controller
>    *
> - * Copyright (C) 2004,2008 Laurent Vivier <[email protected]>
> + * Copyright (C) 2004, 2008 Laurent Vivier <[email protected]>
>    *
>    * based on Alastair Bridgewater SWIM analysis, 2001
>    * based on SWIM3 driver (c) Paul Mackerras, 1996
> @@ -69,7 +69,7 @@ struct swim {
>   	REG(read_handshake)
>   } __attribute__((packed));
>   
> -#define swim_write(base, reg, v) 	out_8(&(base)->write_##reg, (v))
> +#define swim_write(base, reg, v)	out_8(&(base)->write_##reg, (v))
>   #define swim_read(base, reg)		in_8(&(base)->read_##reg)
>   
>   /* IWM registers */
> @@ -93,7 +93,7 @@ struct iwm {
>   	REG(q7H)
>   } __attribute__((packed));
>   
> -#define iwm_write(base, reg, v) 	out_8(&(base)->reg, (v))
> +#define iwm_write(base, reg, v)		out_8(&(base)->reg, (v))
>   #define iwm_read(base, reg)		in_8(&(base)->reg)
>   
>   /* bits in phase register */
> @@ -165,23 +165,23 @@ struct floppy_state {
>   	/* physical properties */
>   
>   	enum drive_location location;	/* internal or external drive */
> -	int		 head_number;	/* single- or double-sided drive */
> +	int head_number;		/* single- or double-sided drive */
>   
>   	/* media */
>   
> -	int		 disk_in;
> -	int		 ejected;
> -	enum media_type	 type;
> -	int		 write_protected;
> +	int disk_in;
> +	int ejected;
> +	enum media_type type;
> +	int write_protected;
>   
> -	unsigned int	 total_secs;
> -	unsigned int	 secpercyl;
> -	unsigned int	 secpertrack;
> +	unsigned int total_secs;
> +	unsigned int secpercyl;
> +	unsigned int secpertrack;
>   
>   	/* in-use information */
>   
> -	int		track;
> -	int		ref_count;
> +	int track;
> +	int ref_count;
>   	bool registered;
>   
>   	struct gendisk *disk;
> @@ -216,6 +216,7 @@ extern int swim_read_sector_data(struct swim __iomem *base,
>   				 unsigned char *data);
>   
>   static DEFINE_MUTEX(swim_mutex);
> +
>   static void set_swim_mode(struct swim __iomem *base, int enable)
>   {
>   	struct iwm __iomem *iwm_base = (struct iwm __iomem *)base;
> @@ -405,7 +406,7 @@ static int swim_seek(struct swim __iomem *base, int step)
>   	if (step == 0)
>   		return 0;
>   
> -	for ( ; step > 0; step--) {
> +	for (; step > 0; step--) {
>   		if (swim_step(base))
>   			return -1;
>   	}
> @@ -416,7 +417,7 @@ static int swim_seek(struct swim __iomem *base, int step)
>   	return 0;
>   }
>   
> -static int swim_track(struct floppy_state *fs,  int track)
> +static int swim_track(struct floppy_state *fs, int track)
>   {
>   	struct swim __iomem *base = fs->swd->base;
>   	int ret;
> @@ -560,10 +561,10 @@ static blk_status_t swim_queue_rq(struct blk_mq_hw_ctx *hctx,
>   }
>   
>   static struct floppy_struct floppy_type[4] = {
> -	{    0,  0, 0,  0, 0, 0x00, 0x00, 0x00, 0x00, NULL }, /* no testing   */
> +	{    0,  0, 0,  0, 0, 0x00, 0x00, 0x00, 0x00, NULL }, /* no testing */
>   	{  720,  9, 1, 80, 0, 0x2A, 0x02, 0xDF, 0x50, NULL }, /* 360KB SS 3.5"*/
> -	{ 1440,  9, 2, 80, 0, 0x2A, 0x02, 0xDF, 0x50, NULL }, /* 720KB 3.5"   */
> -	{ 2880, 18, 2, 80, 0, 0x1B, 0x00, 0xCF, 0x6C, NULL }, /* 1.44MB 3.5"  */
> +	{ 1440,  9, 2, 80, 0, 0x2A, 0x02, 0xDF, 0x50, NULL }, /* 720KB 3.5" */
> +	{ 2880, 18, 2, 80, 0, 0x1B, 0x00, 0xCF, 0x6C, NULL }, /* 1.44MB 3.5" */
>   };
>   
>   static int get_floppy_geometry(struct floppy_state *fs, int type,
> @@ -590,10 +591,11 @@ static void setup_medium(struct floppy_state *fs)
>   
>   	if (swim_readbit(base, DISK_IN)) {
>   		struct floppy_struct *g;
> +
>   		fs->disk_in = 1;
>   		fs->write_protected = swim_readbit(base, WRITE_PROT);
>   		fs->type = swim_readbit(base, TWOMEG_MEDIA) ?
> -			HD_MEDIA : DD_MEDIA;
> +			   HD_MEDIA : DD_MEDIA;
>   		fs->head_number = swim_readbit(base, SINGLE_SIDED) ? 1 : 2;
>   		get_floppy_geometry(fs, 0, &g);
>   		fs->total_secs = g->size;
> @@ -695,7 +697,7 @@ static int floppy_ioctl(struct block_device *bdev, blk_mode_t mode,
>   	int err;
>   
>   	if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
> -			return -EPERM;
> +		return -EPERM;
>   
>   	switch (cmd) {
>   	case FDEJECT:
> @@ -805,7 +807,7 @@ static int swim_floppy_init(struct platform_device *pdev)
>   	struct swim_priv *swd = platform_get_drvdata(pdev);
>   	unsigned int *data = pdev->dev.platform_data;
>   	struct queue_limits lim = {
> -		.features		= BLK_FEAT_ROTATIONAL,
> +		.features = BLK_FEAT_ROTATIONAL,
>   	};
>   	int err;
>   	int drive;
> @@ -963,7 +965,7 @@ static void swim_remove(struct platform_device *dev)
>   static struct platform_driver swim_driver = {
>   	.probe  = swim_probe,
>   	.remove = swim_remove,
> -	.driver   = {
> +	.driver = {
>   		.name	= CARDNAME,
>   	},
>   };
> diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S
> index ae767da671e3..3d5ad525ccde 100644
> --- a/drivers/block/swim_asm.S
> +++ b/drivers/block/swim_asm.S
> @@ -5,7 +5,7 @@
>    * needs assembly language because is very timing dependent
>    * this controller exists only on macintosh 680x0 based
>    *
> - * Copyright (C) 2004,2008 Laurent Vivier <[email protected]>
> + * Copyright (C) 2004, 2008 Laurent Vivier <[email protected]>
>    *
>    * based on Alastair Bridgewater SWIM analysis, 2001
>    * based on netBSD IWM driver (c) 1997, 1998 Hauke Fath.
> @@ -80,7 +80,6 @@ wait_header_init:
>   	moveq	#3, %d1
>   
>   wait_addr_mark_byte:
> -
>   	tstb	%a2@
>   	dbmi	%d2, wait_addr_mark_byte
>   	bpl	signal_nonyb
> @@ -91,7 +90,6 @@ wait_addr_mark_byte:
>   	bne	wait_header_init
>   
>   	moveq	#max_retry, %d2
> -
>   amark0:	tstb	%a2@
>   	dbmi	%d2, amark0
>   	bpl	signal_nonyb
> @@ -99,7 +97,6 @@ amark0:	tstb	%a2@
>   	moveb	%a5@, %a4@(o_track)
>   
>   	moveq	#max_retry, %d2
> -
>   amark1:	tstb	%a2@
>   	dbmi	%d2, amark1
>   	bpl	signal_nonyb
> @@ -107,7 +104,6 @@ amark1:	tstb	%a2@
>   	moveb	%a5@, %a4@(o_side)
>   
>   	moveq	#max_retry, %d2
> -
>   amark2:	tstb	%a2@
>   	dbmi	%d2, amark2
>   	bpl	signal_nonyb
> @@ -115,7 +111,6 @@ amark2:	tstb	%a2@
>   	moveb	%a5@, %a4@(o_sector)
>   
>   	moveq	#max_retry, %d2
> -
>   amark3:	tstb	%a2@
>   	dbmi	%d2, amark3
>   	bpl	signal_nonyb
> @@ -123,7 +118,6 @@ amark3:	tstb	%a2@
>   	moveb	%a5@, %a4@(o_size)
>   
>   	moveq	#max_retry, %d2
> -
>   crc0:	tstb	%a2@
>   	dbmi	%d2, crc0
>   	bpl	signal_nonyb
> @@ -131,7 +125,6 @@ crc0:	tstb	%a2@
>   	moveb	%a5@, %a4@(o_crc0)
>   
>   	moveq	#max_retry, %d2
> -
>   crc1:	moveb	%a2@, %d5
>   	dbmi	%d2, crc1
>   	bpl	signal_nonyb
> @@ -177,7 +170,6 @@ wait_data_init:
>   	/* wait data address mark */
>   
>   wait_data_mark_byte:
> -
>   	tstb	%a2@
>   	dbmi	%d2, wait_data_mark_byte
>   	bpl	data_exit
> @@ -189,7 +181,7 @@ wait_data_mark_byte:
>   
>   	/* read data */
>   
> -	movel	#sector_size-1, %d4		/* sector size */
> +	movel	#sector_size - 1, %d4		/* sector size */
>   read_new_data:
>   	movew	#max_retry, %d2
>   read_data_loop:
> @@ -210,7 +202,6 @@ read_data_loop:
>   
>   	movew	#max_retry, %d2
>   data_crc0:
> -
>   	tstb	%a2@
>   	dbmi	%d2, data_crc0
>   	bpl	data_exit
> @@ -218,9 +209,7 @@ data_crc0:
>   	moveb	%a5@, %d2
>   
>   	moveq	#max_retry, %d2
> -
>   data_crc1:
> -
>   	moveb	%a2@, %d5
>   	dbmi	%d2, data_crc1
>   	bpl	data_exit