tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Automatic merge of 'misc-fixes' branch from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Linus Torvalds 79158229 7ce54e3f

+32 -5
unified split
+3
drivers/scsi/ahci.c
··· 32 32 #include <linux/delay.h> 33 33 #include <linux/interrupt.h> 34 34 #include <linux/sched.h> 35 + #include <linux/dma-mapping.h> 35 36 #include "scsi.h" 36 37 #include <scsi/scsi_host.h> 37 38 #include <linux/libata.h> ··· 290 289 { 291 290 struct ahci_host_priv *hpriv = host_set->private_data; 292 291 kfree(hpriv); 292 + 293 + ata_host_stop(host_set); 293 294 } 294 295 295 296 static int ahci_port_start(struct ata_port *ap)
+2
drivers/scsi/ata_piix.c
··· 153 153 154 154 .port_start = ata_port_start, 155 155 .port_stop = ata_port_stop, 156 + .host_stop = ata_host_stop, 156 157 }; 157 158 158 159 static struct ata_port_operations piix_sata_ops = { ··· 181 180 182 181 .port_start = ata_port_start, 183 182 .port_stop = ata_port_stop, 183 + .host_stop = ata_host_stop, 184 184 }; 185 185 186 186 static struct ata_port_info piix_port_info[] = {
+11 -4
drivers/scsi/libata-core.c
··· 3322 3322 dma_free_coherent(dev, ATA_PRD_TBL_SZ, ap->prd, ap->prd_dma); 3323 3323 } 3324 3324 3325 + void ata_host_stop (struct ata_host_set *host_set) 3326 + { 3327 + if (host_set->mmio_base) 3328 + iounmap(host_set->mmio_base); 3329 + } 3330 + 3331 + 3325 3332 /** 3326 3333 * ata_host_remove - Unregister SCSI host structure with upper layers 3327 3334 * @ap: Port to unregister ··· 3885 3878 } 3886 3879 3887 3880 free_irq(host_set->irq, host_set); 3888 - if (host_set->ops->host_stop) 3889 - host_set->ops->host_stop(host_set); 3890 - if (host_set->mmio_base) 3891 - iounmap(host_set->mmio_base); 3892 3881 3893 3882 for (i = 0; i < host_set->n_ports; i++) { 3894 3883 ap = host_set->ports[i]; ··· 3902 3899 3903 3900 scsi_host_put(ap->host); 3904 3901 } 3902 + 3903 + if (host_set->ops->host_stop) 3904 + host_set->ops->host_stop(host_set); 3905 3905 3906 3906 kfree(host_set); 3907 3907 ··· 4003 3997 EXPORT_SYMBOL_GPL(ata_exec_command); 4004 3998 EXPORT_SYMBOL_GPL(ata_port_start); 4005 3999 EXPORT_SYMBOL_GPL(ata_port_stop); 4000 + EXPORT_SYMBOL_GPL(ata_host_stop); 4006 4001 EXPORT_SYMBOL_GPL(ata_interrupt); 4007 4002 EXPORT_SYMBOL_GPL(ata_qc_prep); 4008 4003 EXPORT_SYMBOL_GPL(ata_bmdma_setup);
+1 -1
drivers/scsi/libata.h
··· 26 26 #define __LIBATA_H__ 27 27 28 28 #define DRV_NAME "libata" 29 - #define DRV_VERSION "1.10" /* must be exactly four chars */ 29 + #define DRV_VERSION "1.11" /* must be exactly four chars */ 30 30 31 31 struct ata_scsi_args { 32 32 u16 *id;
+2
drivers/scsi/sata_nv.c
··· 329 329 host->host_desc->disable_hotplug(host_set); 330 330 331 331 kfree(host); 332 + 333 + ata_host_stop(host_set); 332 334 } 333 335 334 336 static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
+1
drivers/scsi/sata_promise.c
··· 122 122 .scr_write = pdc_sata_scr_write, 123 123 .port_start = pdc_port_start, 124 124 .port_stop = pdc_port_stop, 125 + .host_stop = ata_host_stop, 125 126 }; 126 127 127 128 static struct ata_port_info pdc_port_info[] = {
+2
drivers/scsi/sata_qstor.c
··· 536 536 537 537 writeb(0, mmio_base + QS_HCT_CTRL); /* disable host interrupts */ 538 538 writeb(QS_CNFG3_GSRST, mmio_base + QS_HCF_CNFG3); /* global reset */ 539 + 540 + ata_host_stop(host_set); 539 541 } 540 542 541 543 static void qs_host_init(unsigned int chip_id, struct ata_probe_ent *pe)
+1
drivers/scsi/sata_sil.c
··· 161 161 .scr_write = sil_scr_write, 162 162 .port_start = ata_port_start, 163 163 .port_stop = ata_port_stop, 164 + .host_stop = ata_host_stop, 164 165 }; 165 166 166 167 static struct ata_port_info sil_port_info[] = {
+1
drivers/scsi/sata_sis.c
··· 114 114 .scr_write = sis_scr_write, 115 115 .port_start = ata_port_start, 116 116 .port_stop = ata_port_stop, 117 + .host_stop = ata_host_stop, 117 118 }; 118 119 119 120 static struct ata_port_info sis_port_info = {
+1
drivers/scsi/sata_svw.c
··· 313 313 .scr_write = k2_sata_scr_write, 314 314 .port_start = ata_port_start, 315 315 .port_stop = ata_port_stop, 316 + .host_stop = ata_host_stop, 316 317 }; 317 318 318 319 static void k2_sata_setup_port(struct ata_ioports *port, unsigned long base)
+2
drivers/scsi/sata_sx4.c
··· 245 245 246 246 iounmap(dimm_mmio); 247 247 kfree(hpriv); 248 + 249 + ata_host_stop(host_set); 248 250 } 249 251 250 252 static int pdc_port_start(struct ata_port *ap)
+1
drivers/scsi/sata_uli.c
··· 113 113 114 114 .port_start = ata_port_start, 115 115 .port_stop = ata_port_stop, 116 + .host_stop = ata_host_stop, 116 117 }; 117 118 118 119 static struct ata_port_info uli_port_info = {
+1
drivers/scsi/sata_via.c
··· 134 134 135 135 .port_start = ata_port_start, 136 136 .port_stop = ata_port_stop, 137 + .host_stop = ata_host_stop, 137 138 }; 138 139 139 140 static struct ata_port_info svia_port_info = {
+2
drivers/scsi/sata_vsc.c
··· 21 21 #include <linux/blkdev.h> 22 22 #include <linux/delay.h> 23 23 #include <linux/interrupt.h> 24 + #include <linux/dma-mapping.h> 24 25 #include "scsi.h" 25 26 #include <scsi/scsi_host.h> 26 27 #include <linux/libata.h> ··· 231 230 .scr_write = vsc_sata_scr_write, 232 231 .port_start = ata_port_start, 233 232 .port_stop = ata_port_stop, 233 + .host_stop = ata_host_stop, 234 234 }; 235 235 236 236 static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned long base)
+1
include/linux/libata.h
··· 410 410 extern void ata_exec_command(struct ata_port *ap, struct ata_taskfile *tf); 411 411 extern int ata_port_start (struct ata_port *ap); 412 412 extern void ata_port_stop (struct ata_port *ap); 413 + extern void ata_host_stop (struct ata_host_set *host_set); 413 414 extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs); 414 415 extern void ata_qc_prep(struct ata_queued_cmd *qc); 415 416 extern int ata_qc_issue_prot(struct ata_queued_cmd *qc);