floppy: remove dead code for drives scanning on ARM (3c6051af) · Commits · 戴 / test

On ARM, function fd_scandrives pre-dates Git era, is #ifed 0 out, not used, and cannot even compile since it references an fdc variable that's not declared anywhere (supposed to be the global one that we're turning to current_fdc apparently). There was also an ifdefde out include of mach/floppy.h that does not exist anymore either. Let's get rid of them since they complicate the fixing of the driver. Link: https://lore.kernel.org/r/20200301195555.11154-2-w@1wt.eu Cc: Ian Molton <spyro@f2s.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by:

Willy Tarreau <w@1wt.eu> Signed-off-by:

Denis Efremov <efremov@linux.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

arch/arm/include/asm/floppy.h

+0 −51

Original line number	Diff line number	Diff line
		@@ -8,9 +8,6 @@
		*/
		#ifndef __ASM_ARM_FLOPPY_H
		#define __ASM_ARM_FLOPPY_H
		#if 0
		#include <mach/floppy.h>
		#endif

		#define fd_outb(val,port) \
		do { \
		@@ -69,54 +66,6 @@ do { \
		outb(new_dor, FD_DOR); \
		} while (0)

		/*
		* Someday, we'll automatically detect which drives are present...
		*/
		static inline void fd_scandrives (void)
		{
		#if 0
		int floppy, drive_count;

		fd_disable_irq();
		raw_cmd = &default_raw_cmd;
		raw_cmd->flags = FD_RAW_SPIN \| FD_RAW_NEED_SEEK;
		raw_cmd->track = 0;
		raw_cmd->rate = ?;
		drive_count = 0;
		for (floppy = 0; floppy < 4; floppy ++) {
		current_drive = drive_count;
		/*
		* Turn on floppy motor
		*/
		if (start_motor(redo_fd_request))
		continue;
		/*
		* Set up FDC
		*/
		fdc_specify();
		/*
		* Tell FDC to recalibrate
		*/
		output_byte(FD_RECALIBRATE);
		LAST_OUT(UNIT(floppy));
		/* wait for command to complete */
		if (!successful) {
		int i;
		for (i = drive_count; i < 3; i--)
		floppy_selects[fdc][i] = floppy_selects[fdc][i + 1];
		floppy_selects[fdc][3] = 0;
		floppy -= 1;
		} else
		drive_count++;
		}
		#else
		floppy_selects[0][0] = 0x10;
		floppy_selects[0][1] = 0x21;
		floppy_selects[0][2] = 0x23;
		floppy_selects[0][3] = 0x33;
		#endif
		}

		#define FDC1 (0x3f0)

		#define FLOPPY0_TYPE 4

Admin message