Skip to content

Commit

Permalink
MIPS: ip22-gio: Remove legacy suspend/resume support
Browse files Browse the repository at this point in the history
There are currently no gio device drivers that implement suspend/resume
and this patch removes the bus specific legacy suspend and resume callbacks.
This will allow us to eventually remove struct bus_type legacy suspend and
resume support altogether.

gio device drivers wanting to implement suspend and resume can use dev PM
ops which will work out of the box without further modifications necessary.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8920/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Lars-Peter Clausen authored and Ralf Baechle committed Feb 20, 2015
1 parent 6fb8a16 commit fa75da8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.
2 changes: 0 additions & 2 deletions arch/mips/include/asm/gio_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ struct gio_driver {

int (*probe)(struct gio_device *, const struct gio_device_id *);
void (*remove)(struct gio_device *);
int (*suspend)(struct gio_device *, pm_message_t);
int (*resume)(struct gio_device *);
void (*shutdown)(struct gio_device *);

struct device_driver driver;
Expand Down
24 changes: 0 additions & 24 deletions arch/mips/sgi-ip22/ip22-gio.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,28 +152,6 @@ static int gio_device_remove(struct device *dev)
return 0;
}

static int gio_device_suspend(struct device *dev, pm_message_t state)
{
struct gio_device *gio_dev = to_gio_device(dev);
struct gio_driver *drv = to_gio_driver(dev->driver);
int error = 0;

if (dev->driver && drv->suspend)
error = drv->suspend(gio_dev, state);
return error;
}

static int gio_device_resume(struct device *dev)
{
struct gio_device *gio_dev = to_gio_device(dev);
struct gio_driver *drv = to_gio_driver(dev->driver);
int error = 0;

if (dev->driver && drv->resume)
error = drv->resume(gio_dev);
return error;
}

static void gio_device_shutdown(struct device *dev)
{
struct gio_device *gio_dev = to_gio_device(dev);
Expand Down Expand Up @@ -400,8 +378,6 @@ static struct bus_type gio_bus_type = {
.match = gio_bus_match,
.probe = gio_device_probe,
.remove = gio_device_remove,
.suspend = gio_device_suspend,
.resume = gio_device_resume,
.shutdown = gio_device_shutdown,
.uevent = gio_device_uevent,
};
Expand Down

0 comments on commit fa75da8

Please sign in to comment.