Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 438510f6 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] pm_message_t: more fixes in common and i386 



I thought I'm done with fixing u32 vs.  pm_message_t ...  unfortunately
that turned out not to be the case as Russel King pointed out.  Here are
fixes for Documentation and common code (mainly system devices).

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 74ad74c1

Documentation/driver-model/bus.txt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ struct bus_type { 
	int		(*match)(struct device * dev, struct device_driver * drv);

	int		(*hotplug) (struct device *dev, char **envp, 

				    int num_envp, char *buffer, int buffer_size);

	int		(*suspend)(struct device * dev, u32 state);

	int		(*suspend)(struct device * dev, pm_message_t state);

	int		(*resume)(struct device * dev);

};

Documentation/driver-model/driver.txt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct device_driver { 
        int     (*probe)        (struct device * dev);

        int     (*remove)       (struct device * dev);



        int     (*suspend)      (struct device * dev, u32 state, u32 level);

        int     (*suspend)      (struct device * dev, pm_message_t state, u32 level);

        int     (*resume)       (struct device * dev, u32 level);



        void    (*release)      (struct device_driver * drv);
@@ -195,7 +195,7 @@ device; i.e. anything in the device's driver_data field. 
If the device is still present, it should quiesce the device and place

it into a supported low-power state.



	int	(*suspend)	(struct device * dev, u32 state, u32 level);

	int	(*suspend)	(struct device * dev, pm_message_t state, u32 level);



suspend is called to put the device in a low power state. There are

several stages to successfully suspending a device, which is denoted in

arch/i386/kernel/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static struct { 
	unsigned int apic_thmr;

} apic_pm_state;



static int lapic_suspend(struct sys_device *dev, u32 state)

static int lapic_suspend(struct sys_device *dev, pm_message_t state)

{

	unsigned long flags;

arch/i386/kernel/i8259.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int i8259A_resume(struct sys_device *dev) 
	return 0;

}



static int i8259A_suspend(struct sys_device *dev, u32 state)

static int i8259A_suspend(struct sys_device *dev, pm_message_t state)

{

	save_ELCR(irq_trigger);

	return 0;

arch/i386/kernel/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2299,7 +2299,7 @@ struct sysfs_ioapic_data { 
};

static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS];



static int ioapic_suspend(struct sys_device *dev, u32 state)

static int ioapic_suspend(struct sys_device *dev, pm_message_t state)

{

	struct IO_APIC_route_entry *entry;

	struct sysfs_ioapic_data *data;