Commit c135b659 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  Fix bug - Implement bfin ata interrupt handler to avoid "irq 68 nobody cared" (v2)
  sata_mv: Improve naming of main_irq cause/mask identifiers
  libata-scsi: improve rbuf handling for simulated commands
  libata-scsi: clean up inquiry / mode sense related functions
  [MIPS] ATA: Rename routerboard 500 to 532
parents 5f78e4d3 65c0d4e5

drivers/ata/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -566,11 +566,11 @@ config PATA_RADISYS 


	  If unsure, say N.



config PATA_RB500

	tristate "RouterBoard 500 PATA CompactFlash support"

	depends on MIKROTIK_RB500

config PATA_RB532

	tristate "RouterBoard 532 PATA CompactFlash support"

	depends on MIKROTIK_RB532

	help

	  This option enables support for the RouterBoard 500

	  This option enables support for the RouterBoard 532

	  PATA CompactFlash controller.



	  If unsure, say N.

drivers/ata/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ obj-$(CONFIG_PATA_PDC2027X) += pata_pdc2027x.o 
obj-$(CONFIG_PATA_PDC_OLD)	+= pata_pdc202xx_old.o

obj-$(CONFIG_PATA_QDI)		+= pata_qdi.o

obj-$(CONFIG_PATA_RADISYS)	+= pata_radisys.o

obj-$(CONFIG_PATA_RB500)	+= pata_rb500_cf.o

obj-$(CONFIG_PATA_RB532)	+= pata_rb532_cf.o

obj-$(CONFIG_PATA_RZ1000)	+= pata_rz1000.o

obj-$(CONFIG_PATA_SC1200)	+= pata_sc1200.o

obj-$(CONFIG_PATA_SERVERWORKS)	+= pata_serverworks.o

drivers/ata/libata-scsi.c

+162 −345

File changed.

Preview size limit exceeded, changes collapsed.

drivers/ata/libata.h

+0 −28
Original line number Diff line number Diff line
@@ -146,34 +146,6 @@ extern void ata_scsi_scan_host(struct ata_port *ap, int sync); 
extern int ata_scsi_offline_dev(struct ata_device *dev);

extern void ata_scsi_media_change_notify(struct ata_device *dev);

extern void ata_scsi_hotplug(struct work_struct *work);

extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,

			       unsigned int buflen);



extern unsigned int ata_scsiop_inq_00(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen);



extern unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen);

extern unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen);

extern unsigned int ata_scsiop_noop(struct ata_scsi_args *args, u8 *rbuf,

			    unsigned int buflen);

extern unsigned int ata_scsiop_sync_cache(struct ata_scsi_args *args, u8 *rbuf,

				  unsigned int buflen);

extern unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf,

				  unsigned int buflen);

extern unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf,

			        unsigned int buflen);

extern unsigned int ata_scsiop_report_luns(struct ata_scsi_args *args, u8 *rbuf,

				   unsigned int buflen);

extern void ata_scsi_badcmd(struct scsi_cmnd *cmd,

			    void (*done)(struct scsi_cmnd *),

			    u8 asc, u8 ascq);

extern void ata_scsi_set_sense(struct scsi_cmnd *cmd,

			       u8 sk, u8 asc, u8 ascq);

extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args,

                        unsigned int (*actor) (struct ata_scsi_args *args,

                                           u8 *rbuf, unsigned int buflen));

extern void ata_schedule_scsi_eh(struct Scsi_Host *shost);

extern void ata_scsi_dev_rescan(struct work_struct *work);

extern int ata_bus_probe(struct ata_port *ap);

drivers/ata/pata_bf54x.c

+120 −4

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE