Revert "spi/pl022: fix spi-pl022 pm enable at probe"

From: Ulf Hansson <[email protected]>

This reverts commit 2fb30d1147c599f5657e8c62c862f9a0f58d9d99.

This patch introduced runtime PM issues and is not needed at all. Thus we should revert it.

Conflicts:

        drivers/spi/spi-pl022.c

Signed-off-by Ulf Hansson <[email protected]>

Acked-by Linus Walleij <[email protected]>

---
 drivers/spi/spi-pl022.c |    4 ----
 1 file changed, 4 deletions(-)

drivers/spi/spi-pl022.c +0 -5

index 5cf0643..a1db91a 100644
@@ -2186,9 +2186,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id)
        printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n",
               adev->res.start, pl022->virtbase);
 
-       pm_runtime_enable(dev);
-       pm_runtime_resume(dev);
-
        pl022->clk = devm_clk_get(&adev->dev, NULL);
        if (IS_ERR(pl022->clk)) {
                status = PTR_ERR(pl022->clk);

@@ -2293,7 +2290,6 @@ pl022_remove(struct amba_device *adev)
 
        clk_disable(pl022->clk);
        clk_unprepare(pl022->clk);
-       pm_runtime_disable(&adev->dev);
        amba_release_regions(adev);
        tasklet_disable(&pl022->pump_transfers);
        spi_unregister_master(pl022->master);
--

1.7.10

It seems like this patch did not get applied together with:
[PATCH 1/2] Revert "spi/pl022: fix spi-pl022 pm enable at probe"

The problem was likely my fault, since there were a lot of resends. Anyway, it should still be possible to apply.

Quoted 5 lines · Ulf Hansson

It seems like this patch did not get applied together with:
[PATCH 1/2] Revert "spi/pl022: fix spi-pl022 pm enable at probe"

The problem was likely my fault, since there were a lot of resends. Anyway, it should still be possible to apply.

I *really* should not need to remind you to:

- Not top post
- Send patches in a form which can be applied if you want them applying

Quoted 4 lines · Mark Brown

I *really* should not need to remind you to:

- Not top post
- Send patches in a form which can be applied if you want them applying

How about actually applying the damned patch from the two-part patch set, rather than only the first, both of which has been around for almost a month now, and fixes what should never have gone into mainline in the first place?

Quoted 11 lines · Russell King - ARM Linux

Quoted 4 lines · Mark Brown

I *really* should not need to remind you to:

- Not top post
- Send patches in a form which can be applied if you want them applying

How about actually applying the damned patch from the two-part patch set, rather than only the first, both of which has been around for almost a month now, and fixes what should never have gone into mainline in the first place?

Well, the reason for the second point is that I don't have a copy of the patch any more, I need a copy of it before I can do anything. Half the reason these contentless top posts are annoying is that even if there's something to do it's not actionable.

I have to say I had been under the impression that Linus' series that I applied the other day dealt with all the outstanding stuff here; the issues with this have been the awful changelogs and the overalapping sets of patches.

Quoted 18 lines · Mark Brown

Quoted 11 lines · Russell King - ARM Linux

Quoted 4 lines · Mark Brown

I *really* should not need to remind you to:

- Not top post
- Send patches in a form which can be applied if you want them applying

How about actually applying the damned patch from the two-part patch set, rather than only the first, both of which has been around for almost a month now, and fixes what should never have gone into mainline in the first place?

Well, the reason for the second point is that I don't have a copy of the patch any more, I need a copy of it before I can do anything. Half the reason these contentless top posts are annoying is that even if there's something to do it's not actionable.

Quoted 4 lines

I have to say I had been under the impression that Linus' series that I applied the other day dealt with all the outstanding stuff here; the issues with this have been the awful changelogs and the overalapping sets of patches.

Given that Linus is the one who introduced the fuckups in the first place, and afaics Linus' series has not been posted anywhere I can see, and I have been through the issues and worked with Ulf to get them fixed, I find that to be down right insulting by you.

You received *BOTH* of Ulf's patches on the 5th October. Both needed to be applied *TOGETHER* to reduce the window where things got worse before they got better. But for some goddamned unknown reason you decided to only take the first but totally and utterly ignored the second.

Well done, you've probably crapped this driver up again. Way to go Mark. Now, tell us _exactly_ what patches you've applied to this driver. Post them to this mailing list so we can see them, and see what state this driver is now in.

IMHO, you're being a terrible "maintainer" here - and this is being shown by the need to get you to post all the patches you've currently queued up for this.

Oh, and if you're unwilling to do that, then I'm taking both of Ulf's patches, committing them to my fixes branch, and sending them off to Linus tonight - because they are _NEEDED_ for the -rc series to fix this driver.

Quoted 4 lines · Mark Brown

I have to say I had been under the impression that Linus' series that I applied the other day dealt with all the outstanding stuff here; the issues with this have been the awful changelogs and the overalapping sets of patches.

Given that Linus is the one who introduced the fuckups in the first place, and afaics Linus' series has not been posted anywhere I can see, and I have been through the issues and worked with Ulf to get them fixed, I find that to be down right insulting by you.

You received *BOTH* of Ulf's patches on the 5th October. Both needed to be applied *TOGETHER* to reduce the window where things got worse before they got better. But for some goddamned unknown reason you decided to only take the first but totally and utterly ignored the second.

Well done, you've probably crapped this driver up again. Way to go Mark. Now, tell us _exactly_ what patches you've applied to this driver. Post them to this mailing list so we can see them, and see what state this driver is now in.

IMHO, you're being a terrible "maintainer" here - and this is being shown by the need to get you to post all the patches you've currently queued up for this.

I have to say I had been under the impression that Linus' series that I applied the other day dealt with all the outstanding stuff here; the issues with this have been the awful changelogs and the overalapping sets of patches.

This was already applied, applied the rest thanks.

From: Ulf Hansson <[email protected]>

This reverts commit 6887237cd7da904184dab2750504040c68f3a080.