Skip to content

Commit 3d1b536

Browse files
committed
Merge tag 'ata-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux
Pull ata updates from Niklas Cassel: - Fix typos in comments (Yan Zhen) - Remove unused macro definitions (Damien Le Moal) - Switch back to the .remove() callback (Uwe Kleine-König) - Make use of the get_unaligned_be24() helper instead of open coding (Andy Shevchenko) - Refactor and cleanup ata_scsi_simulate() command emulation, such that all commands use ata_scsi_rbuf_fill() with its own callback (Damien Le Moal) - Improve ata_scsi_simulate() command emulation by accurately setting the SCSI command residual (number of bytes not filled) in the command reply (Damien Le Moal) - Add missing iommus property in ahci-platform device tree binding (Frank Wunderlich) * tag 'ata-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux: dt-bindings: ata: ahci-platform: add missing iommus property ata: libata-scsi: Return residual for emulated SCSI commands ata: libata-scsi: Remove struct ata_scsi_args ata: libata-scsi: Document all VPD page inquiry actors ata: libata-scsi: Refactor ata_scsiop_maint_in() ata: libata-scsi: Refactor ata_scsiop_read_cap() ata: libata-scsi: Refactor ata_scsi_simulate() ata: libata-scsi: Refactor scsi_6_lba_len() with use of get_unaligned_be24() ata: Switch back to struct platform_driver::remove() ata: libata: Remove unused macro definitions ata: Fix typos in the comment
2 parents c14a8a4 + e8a2389 commit 3d1b536

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+361
-262
lines changed

Documentation/devicetree/bindings/ata/ahci-platform.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ properties:
8484
minItems: 1
8585
maxItems: 3
8686

87+
iommus:
88+
maxItems: 1
89+
8790
patternProperties:
8891
"^sata-port@[0-9a-f]+$":
8992
$ref: /schemas/ata/ahci-common.yaml#/$defs/ahci-port

drivers/ata/ahci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,7 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports,
16761676
/*
16771677
* If number of MSIs is less than number of ports then Sharing Last
16781678
* Message mode could be enforced. In this case assume that advantage
1679-
* of multipe MSIs is negated and use single MSI mode instead.
1679+
* of multiple MSIs is negated and use single MSI mode instead.
16801680
*/
16811681
if (n_ports > 1) {
16821682
nvec = pci_alloc_irq_vectors(pdev, n_ports, INT_MAX,

drivers/ata/ahci_brcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ static SIMPLE_DEV_PM_OPS(ahci_brcm_pm_ops, brcm_ahci_suspend, brcm_ahci_resume);
571571

572572
static struct platform_driver brcm_ahci_driver = {
573573
.probe = brcm_ahci_probe,
574-
.remove_new = brcm_ahci_remove,
574+
.remove = brcm_ahci_remove,
575575
.shutdown = brcm_ahci_shutdown,
576576
.driver = {
577577
.name = DRV_NAME,

drivers/ata/ahci_ceva.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ MODULE_DEVICE_TABLE(of, ceva_ahci_of_match);
402402

403403
static struct platform_driver ceva_ahci_driver = {
404404
.probe = ceva_ahci_probe,
405-
.remove_new = ata_platform_remove_one,
405+
.remove = ata_platform_remove_one,
406406
.driver = {
407407
.name = DRV_NAME,
408408
.of_match_table = ceva_ahci_of_match,

drivers/ata/ahci_da850.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ MODULE_DEVICE_TABLE(of, ahci_da850_of_match);
238238

239239
static struct platform_driver ahci_da850_driver = {
240240
.probe = ahci_da850_probe,
241-
.remove_new = ata_platform_remove_one,
241+
.remove = ata_platform_remove_one,
242242
.driver = {
243243
.name = DRV_NAME,
244244
.of_match_table = ahci_da850_of_match,

drivers/ata/ahci_dm816.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ MODULE_DEVICE_TABLE(of, ahci_dm816_of_match);
182182

183183
static struct platform_driver ahci_dm816_driver = {
184184
.probe = ahci_dm816_probe,
185-
.remove_new = ata_platform_remove_one,
185+
.remove = ata_platform_remove_one,
186186
.driver = {
187187
.name = AHCI_DM816_DRV_NAME,
188188
.of_match_table = ahci_dm816_of_match,

drivers/ata/ahci_dwc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ MODULE_DEVICE_TABLE(of, ahci_dwc_of_match);
478478

479479
static struct platform_driver ahci_dwc_driver = {
480480
.probe = ahci_dwc_probe,
481-
.remove_new = ata_platform_remove_one,
481+
.remove = ata_platform_remove_one,
482482
.shutdown = ahci_platform_shutdown,
483483
.driver = {
484484
.name = DRV_NAME,

drivers/ata/ahci_imx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ static int imx_sata_enable(struct ahci_host_priv *hpriv)
511511

512512
if (imxpriv->type == AHCI_IMX6Q || imxpriv->type == AHCI_IMX6QP) {
513513
/*
514-
* set PHY Paremeters, two steps to configure the GPR13,
514+
* set PHY Parameters, two steps to configure the GPR13,
515515
* one write for rest of parameters, mask of first write
516516
* is 0x07ffffff, and the other one write for setting
517517
* the mpll_clk_en.
@@ -1027,7 +1027,7 @@ static SIMPLE_DEV_PM_OPS(ahci_imx_pm_ops, imx_ahci_suspend, imx_ahci_resume);
10271027

10281028
static struct platform_driver imx_ahci_driver = {
10291029
.probe = imx_ahci_probe,
1030-
.remove_new = ata_platform_remove_one,
1030+
.remove = ata_platform_remove_one,
10311031
.driver = {
10321032
.name = DRV_NAME,
10331033
.of_match_table = imx_ahci_of_match,

drivers/ata/ahci_mtk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ MODULE_DEVICE_TABLE(of, ahci_of_match);
174174

175175
static struct platform_driver mtk_ahci_driver = {
176176
.probe = mtk_ahci_probe,
177-
.remove_new = ata_platform_remove_one,
177+
.remove = ata_platform_remove_one,
178178
.driver = {
179179
.name = DRV_NAME,
180180
.of_match_table = ahci_of_match,

drivers/ata/ahci_mvebu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match);
245245

246246
static struct platform_driver ahci_mvebu_driver = {
247247
.probe = ahci_mvebu_probe,
248-
.remove_new = ata_platform_remove_one,
248+
.remove = ata_platform_remove_one,
249249
.suspend = ahci_mvebu_suspend,
250250
.resume = ahci_mvebu_resume,
251251
.driver = {

0 commit comments

Comments
 (0)