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

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ata-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata

Pull ata fixes from Damien Le Moal:

- Revert a change in ata_pci_shutdown_one() to suspend disks on
shutdown as this is now done using the manage_shutdown scsi device
flag (me)

- Change the pata_falcon and pata_gayle drivers to stop using
module_platform_driver_probe(). This makes these drivers more inline
with all other drivers (allowing bind/unbind) and suppress a
compilation warning (Uwe)

- Convert the pata_falcon and pata_gayle drivers to the new
.remove_new() void-return callback. These 2 drivers are the last ones
needing this change (Uwe)

* tag 'ata-6.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
ata: pata_gayle: Convert to platform remove callback returning void
ata: pata_falcon: Convert to platform remove callback returning void
ata: pata_gayle: Stop using module_platform_driver_probe()
ata: pata_falcon: Stop using module_platform_driver_probe()
ata: libata-core: Fix ata_pci_shutdown_one()

Linus Torvalds d035e4eb 391ce5b9

+11 -27
+1 -15
drivers/ata/libata-core.c
··· 6180 6180 void ata_pci_shutdown_one(struct pci_dev *pdev) 6181 6181 { 6182 6182 struct ata_host *host = pci_get_drvdata(pdev); 6183 - struct ata_port *ap; 6184 - unsigned long flags; 6185 6183 int i; 6186 6184 6187 - /* Tell EH to disable all devices */ 6188 6185 for (i = 0; i < host->n_ports; i++) { 6189 - ap = host->ports[i]; 6190 - spin_lock_irqsave(ap->lock, flags); 6191 - ap->pflags |= ATA_PFLAG_UNLOADING; 6192 - ata_port_schedule_eh(ap); 6193 - spin_unlock_irqrestore(ap->lock, flags); 6194 - } 6195 - 6196 - for (i = 0; i < host->n_ports; i++) { 6197 - ap = host->ports[i]; 6198 - 6199 - /* Wait for EH to complete before freezing the port */ 6200 - ata_port_wait_eh(ap); 6186 + struct ata_port *ap = host->ports[i]; 6201 6187 6202 6188 ap->pflags |= ATA_PFLAG_FROZEN; 6203 6189
+5 -6
drivers/ata/pata_falcon.c
··· 121 121 .set_mode = pata_falcon_set_mode, 122 122 }; 123 123 124 - static int __init pata_falcon_init_one(struct platform_device *pdev) 124 + static int pata_falcon_init_one(struct platform_device *pdev) 125 125 { 126 126 struct resource *base_mem_res, *ctl_mem_res; 127 127 struct resource *base_res, *ctl_res, *irq_res; ··· 216 216 IRQF_SHARED, &pata_falcon_sht); 217 217 } 218 218 219 - static int __exit pata_falcon_remove_one(struct platform_device *pdev) 219 + static void pata_falcon_remove_one(struct platform_device *pdev) 220 220 { 221 221 struct ata_host *host = platform_get_drvdata(pdev); 222 222 223 223 ata_host_detach(host); 224 - 225 - return 0; 226 224 } 227 225 228 226 static struct platform_driver pata_falcon_driver = { 229 - .remove = __exit_p(pata_falcon_remove_one), 227 + .probe = pata_falcon_init_one, 228 + .remove_new = pata_falcon_remove_one, 230 229 .driver = { 231 230 .name = "atari-falcon-ide", 232 231 }, 233 232 }; 234 233 235 - module_platform_driver_probe(pata_falcon_driver, pata_falcon_init_one); 234 + module_platform_driver(pata_falcon_driver); 236 235 237 236 MODULE_AUTHOR("Bartlomiej Zolnierkiewicz"); 238 237 MODULE_DESCRIPTION("low-level driver for Atari Falcon PATA");
+5 -6
drivers/ata/pata_gayle.c
··· 124 124 .set_mode = pata_gayle_set_mode, 125 125 }; 126 126 127 - static int __init pata_gayle_init_one(struct platform_device *pdev) 127 + static int pata_gayle_init_one(struct platform_device *pdev) 128 128 { 129 129 struct resource *res; 130 130 struct gayle_ide_platform_data *pdata; ··· 193 193 return 0; 194 194 } 195 195 196 - static int __exit pata_gayle_remove_one(struct platform_device *pdev) 196 + static void pata_gayle_remove_one(struct platform_device *pdev) 197 197 { 198 198 struct ata_host *host = platform_get_drvdata(pdev); 199 199 200 200 ata_host_detach(host); 201 - 202 - return 0; 203 201 } 204 202 205 203 static struct platform_driver pata_gayle_driver = { 206 - .remove = __exit_p(pata_gayle_remove_one), 204 + .probe = pata_gayle_init_one, 205 + .remove_new = pata_gayle_remove_one, 207 206 .driver = { 208 207 .name = "amiga-gayle-ide", 209 208 }, 210 209 }; 211 210 212 - module_platform_driver_probe(pata_gayle_driver, pata_gayle_init_one); 211 + module_platform_driver(pata_gayle_driver); 213 212 214 213 MODULE_AUTHOR("Bartlomiej Zolnierkiewicz"); 215 214 MODULE_DESCRIPTION("low-level driver for Amiga Gayle PATA");