Re: [PATCH 24/31] swim: Remove pointless specifiers

[Laurent Vivier]

Le 16/07/2026 à 12:02, Finn Thain a écrit :
> If the compiler made these functions "as fast as possible" that wouldn't
> actually help because they involve slow mechanical operations. Remove
> pointless inline function specifiers.

In fact the idea was not to make them as fast as possible but a avoid the jump (to keep all the SWIM 
operations in the same functional block).

> Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxx>
> ---
>   drivers/block/swim.c | 20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)

Reviewed-by: Laurent Vivier <laurent@xxxxxxxxx>

> diff --git a/drivers/block/swim.c b/drivers/block/swim.c
> index dae401e649d7..4679f554fec5 100644
> --- a/drivers/block/swim.c
> +++ b/drivers/block/swim.c
> @@ -222,7 +222,7 @@ extern int swim_read_sector_data(struct swim __iomem *base,
>   				 unsigned char *data);
>   
>   static DEFINE_MUTEX(swim_mutex);
> -static inline void set_swim_mode(struct swim __iomem *base, int enable)
> +static void set_swim_mode(struct swim __iomem *base, int enable)
>   {
>   	struct iwm __iomem *iwm_base = (struct iwm __iomem *)base;
>   	unsigned long flags;
> @@ -250,7 +250,7 @@ static inline void set_swim_mode(struct swim __iomem *base, int enable)
>   	local_irq_restore(flags);
>   }
>   
> -static inline int get_swim_mode(struct swim __iomem *base)
> +static int get_swim_mode(struct swim __iomem *base)
>   {
>   	unsigned long flags;
>   
> @@ -324,7 +324,7 @@ static inline bool swim_readbit(struct swim __iomem *base, int bit)
>   	ret; \
>   })
>   
> -static inline void swim_drive(struct swim __iomem *base,
> +static void swim_drive(struct swim __iomem *base,
>   			      enum drive_location location)
>   {
>   	if (location == INTERNAL_DRIVE) {
> @@ -343,8 +343,8 @@ static inline void swim_drive(struct swim __iomem *base,
>   	udelay(1);
>   }
>   
> -static inline void swim_motor(struct swim __iomem *base,
> -			      enum motor_action action)
> +static void swim_motor(struct swim __iomem *base,
> +		       enum motor_action action)
>   {
>   	if (action == ON) {
>   		swim_action(base, MOTOR_ON);
> @@ -355,7 +355,7 @@ static inline void swim_motor(struct swim __iomem *base,
>   	}
>   }
>   
> -static inline void swim_eject(struct swim __iomem *base)
> +static void swim_eject(struct swim __iomem *base)
>   {
>   	swim_action(base, EJECT);
>   	swim_readbit_timeout(base, DISK_IN, false, 2000 * 1000);
> @@ -370,14 +370,14 @@ static inline void swim_head(struct swim __iomem *base, enum head head)
>   		swim_select(base, READ_DATA_0);
>   }
>   
> -static inline int swim_step(struct swim __iomem *base)
> +static int swim_step(struct swim __iomem *base)
>   {
>   	swim_action(base, STEP);
>   	udelay(150);
>   	return swim_readbit_timeout_atomic(base, STEP, false, 20 * 1000);
>   }
>   
> -static inline int swim_track00(struct swim __iomem *base)
> +static int swim_track00(struct swim __iomem *base)
>   {
>   	int try;
>   
> @@ -397,7 +397,7 @@ static inline int swim_track00(struct swim __iomem *base)
>   	return -1;
>   }
>   
> -static inline int swim_seek(struct swim __iomem *base, int step)
> +static int swim_seek(struct swim __iomem *base, int step)
>   {
>   	if (step < 0) {
>   		swim_action(base, SEEK_NEGATIVE);
> @@ -422,7 +422,7 @@ static inline int swim_seek(struct swim __iomem *base, int step)
>   	return 0;
>   }
>   
> -static inline 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;