Merge "UAPI: scsi: move ioctl related information" into msm-4.9 (0d4f37cf) · Commits · e / devices / android_kernel_fairphone_FP3

include/scsi/scsi.h

+0 −21

Original line number	Diff line number	Diff line
		@@ -260,27 +260,6 @@ static inline int scsi_is_wlun(u64 lun)
		#define SCSI_INQ_PQ_NOT_CON 0x01
		#define SCSI_INQ_PQ_NOT_CAP 0x03


		/*
		* Here are some scsi specific ioctl commands which are sometimes useful.
		*
		* Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395
		*/

		/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */
		#define SCSI_IOCTL_GET_IDLUN 0x5382

		/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */

		/* Used to obtain the host number of a device. */
		#define SCSI_IOCTL_PROBE_HOST 0x5385

		/* Used to obtain the bus number for a device */
		#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386

		/* Used to obtain the PCI location of a device */
		#define SCSI_IOCTL_GET_PCI 0x5387

		/* Pull a u32 out of a SCSI message (using BE SCSI conventions) */
		static inline __u32 scsi_to_u32(__u8 *ptr)
		{

+21 −3

Original line number	Diff line number	Diff line
		@@ -17,9 +17,25 @@
		#define SCSI_REMOVAL_PREVENT 1
		#define SCSI_REMOVAL_ALLOW 0

		#ifdef __KERNEL__
		/*
		* Here are some scsi specific ioctl commands which are sometimes useful.
		*
		* Note that include/linux/cdrom.h also defines IOCTL 0x5300 - 0x5395
		*/

		struct scsi_device;
		/* Used to obtain PUN and LUN info. Conflicts with CDROMAUDIOBUFSIZ */
		#define SCSI_IOCTL_GET_IDLUN 0x5382

		/* 0x5383 and 0x5384 were used for SCSI_IOCTL_TAGGED_{ENABLE,DISABLE} */

		/* Used to obtain the host number of a device. */
		#define SCSI_IOCTL_PROBE_HOST 0x5385

		/* Used to obtain the bus number for a device */
		#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386

		/* Used to obtain the PCI location of a device */
		#define SCSI_IOCTL_GET_PCI 0x5387

		/*
		* Structures used for scsi_ioctl et al.
		@@ -42,9 +58,11 @@ typedef struct scsi_fctargaddress {
		unsigned char host_wwn[8]; // include NULL term.
		} Scsi_FCTargAddress;

		#ifdef __KERNEL__
		struct scsi_device;

		int scsi_ioctl_block_when_processing_errors(struct scsi_device *sdev,
		int cmd, bool ndelay);
		extern int scsi_ioctl(struct scsi_device , int, void __user );

		#endif /* __KERNEL__ */
		#endif /* _SCSI_IOCTL_H */