| Message ID | 20190521143023.31810-5-miquel.raynal@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable per-port SATA interrupts and drop a hack in the IRQ subsystem | expand |
On 21/05/2019 15:30, Miquel Raynal wrote: > Before adding more entries in the platform data structure, rename the > flags entry to be more precise and name it host_flags. > > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> > --- > drivers/ata/ahci_mvebu.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c > index d4bba3ace45d..43bb2db59698 100644 > --- a/drivers/ata/ahci_mvebu.c > +++ b/drivers/ata/ahci_mvebu.c > @@ -30,7 +30,7 @@ > > struct ahci_mvebu_plat_data { > int (*plat_config)(struct ahci_host_priv *hpriv); > - unsigned int flags; > + unsigned int host_flags; > }; > > static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv, > @@ -196,7 +196,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev) > if (IS_ERR(hpriv)) > return PTR_ERR(hpriv); > > - hpriv->flags |= pdata->flags; > + hpriv->flags |= pdata->host_flags; > hpriv->plat_data = (void *)pdata; > > rc = ahci_platform_enable_resources(hpriv); > @@ -227,7 +227,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_380_plat_data = { > > static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = { > .plat_config = ahci_mvebu_armada_3700_config, > - .flags = AHCI_HFLAG_SUSPEND_PHYS, > + .host_flags = AHCI_HFLAG_SUSPEND_PHYS, > }; > > static const struct of_device_id ahci_mvebu_of_match[] = { > If, as I suspect, you don't need resource_flags in patch 8, then this patch becomes a bit pointless. Thanks, M.
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index d4bba3ace45d..43bb2db59698 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -30,7 +30,7 @@ struct ahci_mvebu_plat_data { int (*plat_config)(struct ahci_host_priv *hpriv); - unsigned int flags; + unsigned int host_flags; }; static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv, @@ -196,7 +196,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev) if (IS_ERR(hpriv)) return PTR_ERR(hpriv); - hpriv->flags |= pdata->flags; + hpriv->flags |= pdata->host_flags; hpriv->plat_data = (void *)pdata; rc = ahci_platform_enable_resources(hpriv); @@ -227,7 +227,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_380_plat_data = { static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = { .plat_config = ahci_mvebu_armada_3700_config, - .flags = AHCI_HFLAG_SUSPEND_PHYS, + .host_flags = AHCI_HFLAG_SUSPEND_PHYS, }; static const struct of_device_id ahci_mvebu_of_match[] = {
Before adding more entries in the platform data structure, rename the flags entry to be more precise and name it host_flags. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/ata/ahci_mvebu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)