Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4887f76e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

/spare/repo/libata-dev branch 'upstream-fixes'

parents 1410b0a7 6885433c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("AHCI SATA low-level driver");
MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, ahci_pci_tbl);
MODULE_VERSION(DRV_VERSION);

module_init(ahci_init);
module_exit(ahci_exit);
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
#include <linux/libata.h>

#define DRV_NAME	"ata_piix"
#define DRV_VERSION	"1.03"
#define DRV_VERSION	"1.04"

enum {
	PIIX_IOCFG		= 0x54, /* IDE I/O configuration register */
+0 −25
Original line number Diff line number Diff line
@@ -2268,19 +2268,6 @@ void ata_qc_prep(struct ata_queued_cmd *qc)
 *	spin_lock_irqsave(host_set lock)
 */



/**
 *	ata_sg_init_one - Prepare a one-entry scatter-gather list.
 *	@qc:  Queued command
 *	@buf:  transfer buffer
 *	@buflen:  length of buf
 *
 *	Builds a single-entry scatter-gather list to initiate a
 *	transfer utilizing the specified buffer.
 *
 *	LOCKING:
 */
void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
{
	struct scatterlist *sg;
@@ -2312,18 +2299,6 @@ void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
 *	spin_lock_irqsave(host_set lock)
 */


/**
 *	ata_sg_init - Assign a scatter gather list to a queued command
 *	@qc:  Queued command
 *	@sg:  Scatter-gather list
 *	@n_elem:  length of sg list
 *
 *	Attaches a scatter-gather list to a queued command.
 *
 *	LOCKING:
 */

void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
		 unsigned int n_elem)
{
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
#define __LIBATA_H__

#define DRV_NAME	"libata"
#define DRV_VERSION	"1.11"	/* must be exactly four chars */
#define DRV_VERSION	"1.12"	/* must be exactly four chars */

struct ata_scsi_args {
	u16			*id;
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@
#include "sata_promise.h"

#define DRV_NAME	"sata_promise"
#define DRV_VERSION	"1.01"
#define DRV_VERSION	"1.02"


enum {