Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (19da9b8b) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/scsi/ahci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,8 @@
		#include <linux/sched.h>
		#include <linux/dma-mapping.h>
		#include <linux/device.h>
		#include "scsi.h"
		#include <scsi/scsi_host.h>
		#include <scsi/scsi_cmnd.h>
		#include <linux/libata.h>
		#include <asm/io.h>

		@@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap);
		static inline int ahci_host_intr(struct ata_port ap, struct ata_queued_cmd qc);
		static void ahci_remove_one (struct pci_dev *pdev);

		static Scsi_Host_Template ahci_sht = {
		static struct scsi_host_template ahci_sht = {
		.module = THIS_MODULE,
		.name = DRV_NAME,
		.ioctl = ata_scsi_ioctl,

drivers/scsi/ata_piix.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@
		#include <linux/blkdev.h>
		#include <linux/delay.h>
		#include <linux/device.h>
		#include "scsi.h"
		#include <scsi/scsi_host.h>
		#include <linux/libata.h>

		@@ -128,7 +127,7 @@ static struct pci_driver piix_pci_driver = {
		.remove = ata_pci_remove_one,
		};

		static Scsi_Host_Template piix_sht = {
		static struct scsi_host_template piix_sht = {
		.module = THIS_MODULE,
		.name = DRV_NAME,
		.ioctl = ata_scsi_ioctl,

drivers/scsi/libata-core.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@
		#include <linux/jiffies.h>
		#include <linux/scatterlist.h>
		#include <scsi/scsi.h>
		#include "scsi.h"
		#include "scsi_priv.h"
		#include <scsi/scsi_cmnd.h>
		#include <scsi/scsi_host.h>
		#include <linux/libata.h>
		#include <asm/io.h>
		@@ -1144,7 +1144,7 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
		* ATA software reset (SRST, the default) does not appear
		* to have this problem.
		*/
		if ((using_edd) && (qc->tf.command == ATA_CMD_ID_ATA)) {
		if ((using_edd) && (dev->class == ATA_DEV_ATA)) {
		u8 err = qc->tf.feature;
		if (err & ATA_ABORTED) {
		dev->class = ATA_DEV_ATAPI;
		@@ -2713,7 +2713,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
		/**
		* ata_poll_qc_complete - turn irq back on and finish qc
		* @qc: Command to complete
		* @drv_stat: ATA status register content
		* @err_mask: ATA status register content
		*
		* LOCKING:
		* None. (grabs host lock)
		@@ -2747,7 +2747,6 @@ static unsigned long ata_pio_poll(struct ata_port *ap)
		u8 status;
		unsigned int poll_state = HSM_ST_UNKNOWN;
		unsigned int reg_state = HSM_ST_UNKNOWN;
		const unsigned int tmout_state = HSM_ST_TMOUT;

		switch (ap->hsm_task_state) {
		case HSM_ST:
		@@ -2768,7 +2767,7 @@ static unsigned long ata_pio_poll(struct ata_port *ap)
		status = ata_chk_status(ap);
		if (status & ATA_BUSY) {
		if (time_after(jiffies, ap->pio_task_timeout)) {
		ap->hsm_task_state = tmout_state;
		ap->hsm_task_state = HSM_ST_TMOUT;
		return 0;
		}
		ap->hsm_task_state = poll_state;
		@@ -3478,7 +3477,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
		/**
		* ata_qc_complete - Complete an active ATA command
		* @qc: Command to complete
		* @drv_stat: ATA Status register contents
		* @err_mask: ATA Status register contents
		*
		* Indicate to the mid and upper layers that an ATA
		* command has completed, with either an ok or not-ok status.

drivers/scsi/libata-scsi.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@
		#include <linux/blkdev.h>
		#include <linux/spinlock.h>
		#include <scsi/scsi.h>
		#include "scsi.h"
		#include <scsi/scsi_host.h>
		#include <scsi/scsi_device.h>
		#include <scsi/scsi_request.h>
		#include <linux/libata.h>
		#include <linux/hdreg.h>
		#include <asm/uaccess.h>
		@@ -131,7 +131,7 @@ int ata_std_bios_param(struct scsi_device sdev, struct block_device bdev,

		/**
		* ata_cmd_ioctl - Handler for HDIO_DRIVE_CMD ioctl
		* @dev: Device to whom we are issuing command
		* @scsidev: Device to which we are issuing command
		* @arg: User provided data for issuing command
		*
		* LOCKING:
		@@ -217,7 +217,7 @@ int ata_cmd_ioctl(struct scsi_device scsidev, void __user arg)

		/**
		* ata_task_ioctl - Handler for HDIO_DRIVE_TASK ioctl
		* @dev: Device to whom we are issuing command
		* @scsidev: Device to which we are issuing command
		* @arg: User provided data for issuing command
		*
		* LOCKING:
		@@ -416,6 +416,7 @@ void ata_dump_status(unsigned id, struct ata_taskfile *tf)

		/**
		* ata_to_sense_error - convert ATA error to SCSI error
		* @id: ATA device number
		* @drv_stat: value contained in ATA status register
		* @drv_err: value contained in ATA error register
		* @sk: the sense key we'll fill out
		@@ -2231,7 +2232,7 @@ ata_scsi_map_proto(u8 byte1)
		/**
		* ata_scsi_pass_thru - convert ATA pass-thru CDB to taskfile
		* @qc: command structure to be initialized
		* @cmd: SCSI command to convert
		* @scsicmd: SCSI command to convert
		*
		* Handles either 12 or 16-byte versions of the CDB.
		*

drivers/scsi/pdc_adma.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@
		#include <linux/interrupt.h>
		#include <linux/sched.h>
		#include <linux/device.h>
		#include "scsi.h"
		#include <scsi/scsi_host.h>
		#include <asm/io.h>
		#include <linux/libata.h>
		@@ -139,7 +138,7 @@ static u8 adma_bmdma_status(struct ata_port *ap);
		static void adma_irq_clear(struct ata_port *ap);
		static void adma_eng_timeout(struct ata_port *ap);

		static Scsi_Host_Template adma_ata_sht = {
		static struct scsi_host_template adma_ata_sht = {
		.module = THIS_MODULE,
		.name = DRV_NAME,
		.ioctl = ata_scsi_ioctl,