pata_ali: remove all the crap again and switch to cable_detect method (b723d144) · Commits · 戴 / test

drivers/ata/pata_ali.c

+9 −59

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		#include <linux/dmi.h>

		#define DRV_NAME "pata_ali"
		#define DRV_VERSION "0.7.3"
		#define DRV_VERSION "0.7.4"

		/*
		* Cable special cases
		@@ -89,59 +89,6 @@ static int ali_c2_cable_detect(struct ata_port *ap)
		return ATA_CBL_PATA80;
		}

		/**
		* ali_early_error_handler - reset for eary chip
		* @ap: ATA port
		*
		* Handle the reset callback for the later chips with cable detect
		*/

		static int ali_c2_pre_reset(struct ata_port *ap)
		{
		ap->cbl = ali_c2_cable_detect(ap);
		return ata_std_prereset(ap);
		}

		static void ali_c2_error_handler(struct ata_port *ap)
		{
		ata_bmdma_drive_eh(ap, ali_c2_pre_reset,
		ata_std_softreset, NULL,
		ata_std_postreset);
		}

		/**
		* ali_early_cable_detect - cable detection
		* @ap: ATA port
		*
		* Perform cable detection for older chipsets. This turns out to be
		* rather easy to implement
		*/

		static int ali_early_cable_detect(struct ata_port *ap)
		{
		return ATA_CBL_PATA40;
		}

		/**
		* ali_early_probe_init - reset for early chip
		* @ap: ATA port
		*
		* Handle the reset callback for the early (pre cable detect) chips.
		*/

		static int ali_early_pre_reset(struct ata_port *ap)
		{
		ap->cbl = ali_early_cable_detect(ap);
		return ata_std_prereset(ap);
		}

		static void ali_early_error_handler(struct ata_port *ap)
		{
		return ata_bmdma_drive_eh(ap, ali_early_pre_reset,
		ata_std_softreset, NULL,
		ata_std_postreset);
		}

		/**
		* ali_20_filter - filter for earlier ALI DMA
		* @ap: ALi ATA port
		@@ -314,7 +261,6 @@ static void ali_set_dmamode(struct ata_port ap, struct ata_device adev)

		/**
		* ali_lock_sectors - Keep older devices to 255 sector mode
		* @ap: ATA port
		* @adev: Device
		*
		* Called during the bus probe for each device that is found. We use
		@@ -366,8 +312,9 @@ static struct ata_port_operations ali_early_port_ops = {

		.freeze = ata_bmdma_freeze,
		.thaw = ata_bmdma_thaw,
		.error_handler = ali_early_error_handler,
		.error_handler = ata_bmdma_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = ata_cable_40wire,

		.qc_prep = ata_qc_prep,
		.qc_issue = ata_qc_issue_prot,
		@@ -402,8 +349,9 @@ static struct ata_port_operations ali_20_port_ops = {

		.freeze = ata_bmdma_freeze,
		.thaw = ata_bmdma_thaw,
		.error_handler = ali_early_error_handler,
		.error_handler = ata_bmdma_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = ata_cable_40wire,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = ata_bmdma_start,
		@@ -440,8 +388,9 @@ static struct ata_port_operations ali_c2_port_ops = {

		.freeze = ata_bmdma_freeze,
		.thaw = ata_bmdma_thaw,
		.error_handler = ali_c2_error_handler,
		.error_handler = ata_bmdma_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = ali_c2_cable_detect,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = ata_bmdma_start,
		@@ -477,8 +426,9 @@ static struct ata_port_operations ali_c5_port_ops = {

		.freeze = ata_bmdma_freeze,
		.thaw = ata_bmdma_thaw,
		.error_handler = ali_c2_error_handler,
		.error_handler = ata_bmdma_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = ali_c2_cable_detect,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = ata_bmdma_start,

Admin message