ddf90a27 parents dfb8518 5693188 56cb248 d098bc7 34fd421 90cf241 d12379a630 files · +5966 −3821Browse filesShowing the changes to include (29 of 630 files). Show all
Unified · Split
| @@ -35,6 +35,14 @@ typedef union sigval { · 34 unmodified lines | ||
| 35 | 35 | #define __ARCH_SI_BAND_T long |
| 36 | 36 | #endif |
| 37 | 37 | |
| 38 | +#ifndef __ARCH_SI_CLOCK_T | |
| 39 | +#define __ARCH_SI_CLOCK_T __kernel_clock_t | |
| 40 | +#endif | |
| 41 | + | |
| 42 | +#ifndef __ARCH_SI_ATTRIBUTES | |
| 43 | +#define __ARCH_SI_ATTRIBUTES | |
| 44 | +#endif | |
| 45 | + | |
| 38 | 46 | #ifndef HAVE_ARCH_SIGINFO_T |
| 39 | 47 | |
| 40 | 48 | typedef struct siginfo { |
| @@ -72,8 +80,8 @@ typedef struct siginfo { · 31 unmodified lines | ||
| 72 | 80 | __kernel_pid_t _pid; /* which child */ |
| 73 | 81 | __ARCH_SI_UID_T _uid; /* sender's uid */ |
| 74 | 82 | int _status; /* exit code */ |
| 75 | − __kernel_clock_t _utime; | |
| 76 | − __kernel_clock_t _stime; | |
| 83 | + __ARCH_SI_CLOCK_T _utime; | |
| 84 | + __ARCH_SI_CLOCK_T _stime; | |
| 77 | 85 | } _sigchld; |
| 78 | 86 | |
| 79 | 87 | /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ |
| @@ -91,7 +99,7 @@ typedef struct siginfo { · 11 unmodified lines | ||
| 91 | 99 | int _fd; |
| 92 | 100 | } _sigpoll; |
| 93 | 101 | } _sifields; |
| 94 | −} siginfo_t; | |
| 102 | +} __ARCH_SI_ATTRIBUTES siginfo_t; | |
| 95 | 103 | |
| 96 | 104 | #endif |
| 97 | 105 | |
| @@ -554,7 +554,18 @@ extern int __init efi_setup_pcdp_console(char *); · 553 unmodified lines | ||
| 554 | 554 | #define EFI_VARIABLE_NON_VOLATILE 0x0000000000000001 |
| 555 | 555 | #define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002 |
| 556 | 556 | #define EFI_VARIABLE_RUNTIME_ACCESS 0x0000000000000004 |
| 557 | − | |
| 557 | +#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x0000000000000008 | |
| 558 | +#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x0000000000000010 | |
| 559 | +#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x0000000000000020 | |
| 560 | +#define EFI_VARIABLE_APPEND_WRITE 0x0000000000000040 | |
| 561 | + | |
| 562 | +#define EFI_VARIABLE_MASK (EFI_VARIABLE_NON_VOLATILE | \ | |
| 563 | + EFI_VARIABLE_BOOTSERVICE_ACCESS | \ | |
| 564 | + EFI_VARIABLE_RUNTIME_ACCESS | \ | |
| 565 | + EFI_VARIABLE_HARDWARE_ERROR_RECORD | \ | |
| 566 | + EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS | \ | |
| 567 | + EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS | \ | |
| 568 | + EFI_VARIABLE_APPEND_WRITE) | |
| 558 | 569 | /* |
| 559 | 570 | * The type of search to perform when calling boottime->locate_handle |
| 560 | 571 | */ |
| @@ -593,7 +593,7 @@ struct fuse_dirent { · 592 unmodified lines | ||
| 593 | 593 | __u64 off; |
| 594 | 594 | __u32 namelen; |
| 595 | 595 | __u32 type; |
| 596 | − char name[0]; | |
| 596 | + char name[]; | |
| 597 | 597 | }; |
| 598 | 598 | |
| 599 | 599 | #define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name) |
| @@ -13,4 +13,8 @@ extern int pxa_last_gpio; · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | extern int pxa_irq_to_gpio(int irq); |
| 15 | 15 | |
| 16 | +struct pxa_gpio_platform_data { | |
| 17 | + int (*gpio_set_wake)(unsigned int gpio, unsigned int on); | |
| 18 | +}; | |
| 19 | + | |
| 16 | 20 | #endif /* __GPIO_PXA_H */ |
| @@ -26,9 +26,9 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/device.h> |
| 27 | 27 | #include <linux/mutex.h> |
| 28 | 28 | #include <linux/scatterlist.h> |
| 29 | −#include <linux/spinlock.h> | |
| 30 | 29 | #include <linux/list.h> |
| 31 | 30 | #include <linux/module.h> |
| 31 | +#include <linux/notifier.h> | |
| 32 | 32 | |
| 33 | 33 | /* HSI message ttype */ |
| 34 | 34 | #define HSI_MSG_READ 0 |
| @@ -121,18 +121,18 @@ static inline int hsi_register_board_info(struct hsi_board_info const *info, · 86 unmodified lines | ||
| 121 | 121 | * @device: Driver model representation of the device |
| 122 | 122 | * @tx_cfg: HSI TX configuration |
| 123 | 123 | * @rx_cfg: HSI RX configuration |
| 124 | − * @hsi_start_rx: Called after incoming wake line goes high | |
| 125 | − * @hsi_stop_rx: Called after incoming wake line goes low | |
| 124 | + * @e_handler: Callback for handling port events (RX Wake High/Low) | |
| 125 | + * @pclaimed: Keeps tracks if the clients claimed its associated HSI port | |
| 126 | + * @nb: Notifier block for port events | |
| 126 | 127 | */ |
| 127 | 128 | struct hsi_client { |
| 128 | 129 | struct device device; |
| 129 | 130 | struct hsi_config tx_cfg; |
| 130 | 131 | struct hsi_config rx_cfg; |
| 131 | − void (*hsi_start_rx)(struct hsi_client *cl); | |
| 132 | − void (*hsi_stop_rx)(struct hsi_client *cl); | |
| 133 | 132 | /* private: */ |
| 133 | + void (*ehandler)(struct hsi_client *, unsigned long); | |
| 134 | 134 | unsigned int pclaimed:1; |
| 135 | − struct list_head link; | |
| 135 | + struct notifier_block nb; | |
| 136 | 136 | }; |
| 137 | 137 | |
| 138 | 138 | #define to_hsi_client(dev) container_of(dev, struct hsi_client, device) |
| @@ -147,6 +147,10 @@ static inline void *hsi_client_drvdata(struct hsi_client *cl) · 8 unmodified lines | ||
| 147 | 147 | return dev_get_drvdata(&cl->device); |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | +int hsi_register_port_event(struct hsi_client *cl, | |
| 151 | + void (*handler)(struct hsi_client *, unsigned long)); | |
| 152 | +int hsi_unregister_port_event(struct hsi_client *cl); | |
| 153 | + | |
| 150 | 154 | /** |
| 151 | 155 | * struct hsi_client_driver - Driver associated to an HSI client |
| 152 | 156 | * @driver: Driver model representation of the driver |
| @@ -214,8 +218,7 @@ void hsi_free_msg(struct hsi_msg *msg); · 61 unmodified lines | ||
| 214 | 218 | * @start_tx: Callback to inform that a client wants to TX data |
| 215 | 219 | * @stop_tx: Callback to inform that a client no longer wishes to TX data |
| 216 | 220 | * @release: Callback to inform that a client no longer uses the port |
| 217 | − * @clients: List of hsi_clients using the port. | |
| 218 | − * @clock: Lock to serialize access to the clients list. | |
| 221 | + * @n_head: Notifier chain for signaling port events to the clients. | |
| 219 | 222 | */ |
| 220 | 223 | struct hsi_port { |
| 221 | 224 | struct device device; |
| @@ -231,14 +234,14 @@ struct hsi_port { · 9 unmodified lines | ||
| 231 | 234 | int (*start_tx)(struct hsi_client *cl); |
| 232 | 235 | int (*stop_tx)(struct hsi_client *cl); |
| 233 | 236 | int (*release)(struct hsi_client *cl); |
| 234 | − struct list_head clients; | |
| 235 | − spinlock_t clock; | |
| 237 | + /* private */ | |
| 238 | + struct atomic_notifier_head n_head; | |
| 236 | 239 | }; |
| 237 | 240 | |
| 238 | 241 | #define to_hsi_port(dev) container_of(dev, struct hsi_port, device) |
| 239 | 242 | #define hsi_get_port(cl) to_hsi_port((cl)->device.parent) |
| 240 | 243 | |
| 241 | −void hsi_event(struct hsi_port *port, unsigned int event); | |
| 244 | +int hsi_event(struct hsi_port *port, unsigned long event); | |
| 242 | 245 | int hsi_claim_port(struct hsi_client *cl, unsigned int share); |
| 243 | 246 | void hsi_release_port(struct hsi_client *cl); |
| 244 | 247 | |
| @@ -270,13 +273,13 @@ struct hsi_controller { · 25 unmodified lines | ||
| 270 | 273 | struct module *owner; |
| 271 | 274 | unsigned int id; |
| 272 | 275 | unsigned int num_ports; |
| 273 | − struct hsi_port *port; | |
| 276 | + struct hsi_port **port; | |
| 274 | 277 | }; |
| 275 | 278 | |
| 276 | 279 | #define to_hsi_controller(dev) container_of(dev, struct hsi_controller, device) |
| 277 | 280 | |
| 278 | 281 | struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags); |
| 279 | −void hsi_free_controller(struct hsi_controller *hsi); | |
| 282 | +void hsi_put_controller(struct hsi_controller *hsi); | |
| 280 | 283 | int hsi_register_controller(struct hsi_controller *hsi); |
| 281 | 284 | void hsi_unregister_controller(struct hsi_controller *hsi); |
| 282 | 285 | |
| @@ -294,7 +297,7 @@ static inline void *hsi_controller_drvdata(struct hsi_controller *hsi) · 11 unmodified lines | ||
| 294 | 297 | static inline struct hsi_port *hsi_find_port_num(struct hsi_controller *hsi, |
| 295 | 298 | unsigned int num) |
| 296 | 299 | { |
| 297 | − return (num < hsi->num_ports) ? &hsi->port[num] : NULL; | |
| 300 | + return (num < hsi->num_ports) ? hsi->port[num] : NULL; | |
| 298 | 301 | } |
| 299 | 302 | |
| 300 | 303 | /* |
| @@ -666,23 +666,11 @@ struct twl4030_codec_data { · 665 unmodified lines | ||
| 666 | 666 | unsigned int check_defaults:1; |
| 667 | 667 | unsigned int reset_registers:1; |
| 668 | 668 | unsigned int hs_extmute:1; |
| 669 | − u16 hs_left_step; | |
| 670 | − u16 hs_right_step; | |
| 671 | − u16 hf_left_step; | |
| 672 | − u16 hf_right_step; | |
| 673 | 669 | void (*set_hs_extmute)(int mute); |
| 674 | 670 | }; |
| 675 | 671 | |
| 676 | 672 | struct twl4030_vibra_data { |
| 677 | 673 | unsigned int coexist; |
| 678 | − | |
| 679 | − /* twl6040 */ | |
| 680 | − unsigned int vibldrv_res; /* left driver resistance */ | |
| 681 | − unsigned int vibrdrv_res; /* right driver resistance */ | |
| 682 | − unsigned int viblmotor_res; /* left motor resistance */ | |
| 683 | − unsigned int vibrmotor_res; /* right motor resistance */ | |
| 684 | − int vddvibl_uV; /* VDDVIBL volt, set 0 for fixed reg */ | |
| 685 | − int vddvibr_uV; /* VDDVIBR volt, set 0 for fixed reg */ | |
| 686 | 674 | }; |
| 687 | 675 | |
| 688 | 676 | struct twl4030_audio_data { |
| @@ -49,6 +49,12 @@ typedef void (*irq_preflow_handler_t)(struct irq_data *data); · 48 unmodified lines | ||
| 49 | 49 | * IRQ_TYPE_LEVEL_LOW - low level triggered |
| 50 | 50 | * IRQ_TYPE_LEVEL_MASK - Mask to filter out the level bits |
| 51 | 51 | * IRQ_TYPE_SENSE_MASK - Mask for all the above bits |
| 52 | + * IRQ_TYPE_DEFAULT - For use by some PICs to ask irq_set_type | |
| 53 | + * to setup the HW to a sane default (used | |
| 54 | + * by irqdomain map() callbacks to synchronize | |
| 55 | + * the HW state and SW flags for a newly | |
| 56 | + * allocated descriptor). | |
| 57 | + * | |
| 52 | 58 | * IRQ_TYPE_PROBE - Special flag for probing in progress |
| 53 | 59 | * |
| 54 | 60 | * Bits which can be modified via irq_set/clear/modify_status_flags() |
| @@ -77,6 +83,7 @@ enum { · 22 unmodified lines | ||
| 77 | 83 | IRQ_TYPE_LEVEL_LOW = 0x00000008, |
| 78 | 84 | IRQ_TYPE_LEVEL_MASK = (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH), |
| 79 | 85 | IRQ_TYPE_SENSE_MASK = 0x0000000f, |
| 86 | + IRQ_TYPE_DEFAULT = IRQ_TYPE_SENSE_MASK, | |
| 80 | 87 | |
| 81 | 88 | IRQ_TYPE_PROBE = 0x00000010, |
| 82 | 89 | |
| @@ -596,6 +596,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id); · 595 unmodified lines | ||
| 596 | 596 | |
| 597 | 597 | #ifdef CONFIG_IOMMU_API |
| 598 | 598 | int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot); |
| 599 | +void kvm_iommu_unmap_pages(struct kvm *kvm, struct kvm_memory_slot *slot); | |
| 599 | 600 | int kvm_iommu_map_guest(struct kvm *kvm); |
| 600 | 601 | int kvm_iommu_unmap_guest(struct kvm *kvm); |
| 601 | 602 | int kvm_assign_device(struct kvm *kvm, |
| @@ -609,6 +610,11 @@ static inline int kvm_iommu_map_pages(struct kvm *kvm, · 7 unmodified lines | ||
| 609 | 610 | return 0; |
| 610 | 611 | } |
| 611 | 612 | |
| 613 | +static inline void kvm_iommu_unmap_pages(struct kvm *kvm, | |
| 614 | + struct kvm_memory_slot *slot) | |
| 615 | +{ | |
| 616 | +} | |
| 617 | + | |
| 612 | 618 | static inline int kvm_iommu_map_guest(struct kvm *kvm) |
| 613 | 619 | { |
| 614 | 620 | return -ENODEV; |
| @@ -996,7 +996,8 @@ extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev, · 995 unmodified lines | ||
| 996 | 996 | extern void ata_sas_port_destroy(struct ata_port *); |
| 997 | 997 | extern struct ata_port *ata_sas_port_alloc(struct ata_host *, |
| 998 | 998 | struct ata_port_info *, struct Scsi_Host *); |
| 999 | −extern int ata_sas_async_port_init(struct ata_port *); | |
| 999 | +extern void ata_sas_async_probe(struct ata_port *ap); | |
| 1000 | +extern int ata_sas_sync_probe(struct ata_port *ap); | |
| 1000 | 1001 | extern int ata_sas_port_init(struct ata_port *); |
| 1001 | 1002 | extern int ata_sas_port_start(struct ata_port *ap); |
| 1002 | 1003 | extern void ata_sas_port_stop(struct ata_port *ap); |
| @@ -8,41 +8,14 @@ · 7 unmodified lines | ||
| 8 | 8 | #ifndef __MFD_DB5500_PRCMU_H |
| 9 | 9 | #define __MFD_DB5500_PRCMU_H |
| 10 | 10 | |
| 11 | −#ifdef CONFIG_MFD_DB5500_PRCMU | |
| 12 | − | |
| 13 | −void db5500_prcmu_early_init(void); | |
| 14 | −int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state); | |
| 15 | −int db5500_prcmu_set_display_clocks(void); | |
| 16 | −int db5500_prcmu_disable_dsipll(void); | |
| 17 | −int db5500_prcmu_enable_dsipll(void); | |
| 18 | −int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size); | |
| 19 | −int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size); | |
| 20 | −void db5500_prcmu_enable_wakeups(u32 wakeups); | |
| 21 | −int db5500_prcmu_request_clock(u8 clock, bool enable); | |
| 22 | −void db5500_prcmu_config_abb_event_readout(u32 abb_events); | |
| 23 | −void db5500_prcmu_get_abb_event_buffer(void __iomem **buf); | |
| 24 | −int prcmu_resetout(u8 resoutn, u8 state); | |
| 25 | −int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, | |
| 26 | − bool keep_ap_pll); | |
| 27 | −int db5500_prcmu_config_esram0_deep_sleep(u8 state); | |
| 28 | −void db5500_prcmu_system_reset(u16 reset_code); | |
| 29 | −u16 db5500_prcmu_get_reset_code(void); | |
| 30 | −bool db5500_prcmu_is_ac_wake_requested(void); | |
| 31 | −int db5500_prcmu_set_arm_opp(u8 opp); | |
| 32 | −int db5500_prcmu_get_arm_opp(void); | |
| 33 | − | |
| 34 | −#else /* !CONFIG_UX500_SOC_DB5500 */ | |
| 35 | − | |
| 36 | −static inline void db5500_prcmu_early_init(void) {} | |
| 37 | − | |
| 38 | −static inline int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size) | |
| 11 | +static inline int prcmu_resetout(u8 resoutn, u8 state) | |
| 39 | 12 | { |
| 40 | − return -ENOSYS; | |
| 13 | + return 0; | |
| 41 | 14 | } |
| 42 | 15 | |
| 43 | −static inline int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size) | |
| 16 | +static inline int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state) | |
| 44 | 17 | { |
| 45 | − return -ENOSYS; | |
| 18 | + return 0; | |
| 46 | 19 | } |
| 47 | 20 | |
| 48 | 21 | static inline int db5500_prcmu_request_clock(u8 clock, bool enable) |
| @@ -50,69 +23,82 @@ static inline int db5500_prcmu_request_clock(u8 clock, bool enable) · 1 unmodified line | ||
| 50 | 23 | return 0; |
| 51 | 24 | } |
| 52 | 25 | |
| 53 | −static inline int db5500_prcmu_set_display_clocks(void) | |
| 26 | +static inline int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, | |
| 27 | + bool keep_ap_pll) | |
| 54 | 28 | { |
| 55 | 29 | return 0; |
| 56 | 30 | } |
| 57 | 31 | |
| 58 | −static inline int db5500_prcmu_disable_dsipll(void) | |
| 32 | +static inline int db5500_prcmu_config_esram0_deep_sleep(u8 state) | |
| 59 | 33 | { |
| 60 | 34 | return 0; |
| 61 | 35 | } |
| 62 | 36 | |
| 63 | −static inline int db5500_prcmu_enable_dsipll(void) | |
| 37 | +static inline u16 db5500_prcmu_get_reset_code(void) | |
| 64 | 38 | { |
| 65 | 39 | return 0; |
| 66 | 40 | } |
| 67 | 41 | |
| 68 | −static inline int db5500_prcmu_config_esram0_deep_sleep(u8 state) | |
| 42 | +static inline bool db5500_prcmu_is_ac_wake_requested(void) | |
| 69 | 43 | { |
| 70 | 44 | return 0; |
| 71 | 45 | } |
| 72 | 46 | |
| 73 | −static inline void db5500_prcmu_enable_wakeups(u32 wakeups) {} | |
| 74 | − | |
| 75 | −static inline int prcmu_resetout(u8 resoutn, u8 state) | |
| 47 | +static inline int db5500_prcmu_set_arm_opp(u8 opp) | |
| 76 | 48 | { |
| 77 | 49 | return 0; |
| 78 | 50 | } |
| 79 | 51 | |
| 80 | −static inline int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state) | |
| 52 | +static inline int db5500_prcmu_get_arm_opp(void) | |
| 81 | 53 | { |
| 82 | 54 | return 0; |
| 83 | 55 | } |
| 84 | 56 | |
| 85 | −static inline void db5500_prcmu_get_abb_event_buffer(void __iomem **buf) {} | |
| 86 | 57 | static inline void db5500_prcmu_config_abb_event_readout(u32 abb_events) {} |
| 87 | 58 | |
| 88 | −static inline int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk, | |
| 89 | − bool keep_ap_pll) | |
| 90 | −{ | |
| 91 | − return 0; | |
| 92 | −} | |
| 59 | +static inline void db5500_prcmu_get_abb_event_buffer(void __iomem **buf) {} | |
| 93 | 60 | |
| 94 | 61 | static inline void db5500_prcmu_system_reset(u16 reset_code) {} |
| 95 | 62 | |
| 96 | −static inline u16 db5500_prcmu_get_reset_code(void) | |
| 63 | +static inline void db5500_prcmu_enable_wakeups(u32 wakeups) {} | |
| 64 | + | |
| 65 | +#ifdef CONFIG_MFD_DB5500_PRCMU | |
| 66 | + | |
| 67 | +void db5500_prcmu_early_init(void); | |
| 68 | +int db5500_prcmu_set_display_clocks(void); | |
| 69 | +int db5500_prcmu_disable_dsipll(void); | |
| 70 | +int db5500_prcmu_enable_dsipll(void); | |
| 71 | +int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size); | |
| 72 | +int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size); | |
| 73 | + | |
| 74 | +#else /* !CONFIG_UX500_SOC_DB5500 */ | |
| 75 | + | |
| 76 | +static inline void db5500_prcmu_early_init(void) {} | |
| 77 | + | |
| 78 | +static inline int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size) | |
| 97 | 79 | { |
| 98 | − return 0; | |
| 80 | + return -ENOSYS; | |
| 99 | 81 | } |
| 100 | 82 | |
| 101 | −static inline bool db5500_prcmu_is_ac_wake_requested(void) | |
| 83 | +static inline int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size) | |
| 102 | 84 | { |
| 103 | − return 0; | |
| 85 | + return -ENOSYS; | |
| 104 | 86 | } |
| 105 | 87 | |
| 106 | −static inline int db5500_prcmu_set_arm_opp(u8 opp) | |
| 88 | +static inline int db5500_prcmu_set_display_clocks(void) | |
| 107 | 89 | { |
| 108 | 90 | return 0; |
| 109 | 91 | } |
| 110 | 92 | |
| 111 | −static inline int db5500_prcmu_get_arm_opp(void) | |
| 93 | +static inline int db5500_prcmu_disable_dsipll(void) | |
| 112 | 94 | { |
| 113 | 95 | return 0; |
| 114 | 96 | } |
| 115 | 97 | |
| 98 | +static inline int db5500_prcmu_enable_dsipll(void) | |
| 99 | +{ | |
| 100 | + return 0; | |
| 101 | +} | |
| 116 | 102 | |
| 117 | 103 | #endif /* CONFIG_MFD_DB5500_PRCMU */ |
| 118 | 104 | |
| @@ -26,6 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | |
| 27 | 27 | #include <linux/mutex.h> |
| 28 | 28 | #include <linux/types.h> |
| 29 | +#include <linux/regmap.h> | |
| 29 | 30 | |
| 30 | 31 | #define RC5T583_MAX_REGS 0xF8 |
| 31 | 32 | |
| @@ -279,14 +280,44 @@ struct rc5t583_platform_data { · 247 unmodified lines | ||
| 279 | 280 | bool enable_shutdown; |
| 280 | 281 | }; |
| 281 | 282 | |
| 282 | −int rc5t583_write(struct device *dev, u8 reg, uint8_t val); | |
| 283 | −int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val); | |
| 284 | −int rc5t583_set_bits(struct device *dev, unsigned int reg, | |
| 285 | − unsigned int bit_mask); | |
| 286 | −int rc5t583_clear_bits(struct device *dev, unsigned int reg, | |
| 287 | − unsigned int bit_mask); | |
| 288 | −int rc5t583_update(struct device *dev, unsigned int reg, | |
| 289 | − unsigned int val, unsigned int mask); | |
| 283 | +static inline int rc5t583_write(struct device *dev, uint8_t reg, uint8_t val) | |
| 284 | +{ | |
| 285 | + struct rc5t583 *rc5t583 = dev_get_drvdata(dev); | |
| 286 | + return regmap_write(rc5t583->regmap, reg, val); | |
| 287 | +} | |
| 288 | + | |
| 289 | +static inline int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val) | |
| 290 | +{ | |
| 291 | + struct rc5t583 *rc5t583 = dev_get_drvdata(dev); | |
| 292 | + unsigned int ival; | |
| 293 | + int ret; | |
| 294 | + ret = regmap_read(rc5t583->regmap, reg, &ival); | |
| 295 | + if (!ret) | |
| 296 | + *val = (uint8_t)ival; | |
| 297 | + return ret; | |
| 298 | +} | |
| 299 | + | |
| 300 | +static inline int rc5t583_set_bits(struct device *dev, unsigned int reg, | |
| 301 | + unsigned int bit_mask) | |
| 302 | +{ | |
| 303 | + struct rc5t583 *rc5t583 = dev_get_drvdata(dev); | |
| 304 | + return regmap_update_bits(rc5t583->regmap, reg, bit_mask, bit_mask); | |
| 305 | +} | |
| 306 | + | |
| 307 | +static inline int rc5t583_clear_bits(struct device *dev, unsigned int reg, | |
| 308 | + unsigned int bit_mask) | |
| 309 | +{ | |
| 310 | + struct rc5t583 *rc5t583 = dev_get_drvdata(dev); | |
| 311 | + return regmap_update_bits(rc5t583->regmap, reg, bit_mask, 0); | |
| 312 | +} | |
| 313 | + | |
| 314 | +static inline int rc5t583_update(struct device *dev, unsigned int reg, | |
| 315 | + unsigned int val, unsigned int mask) | |
| 316 | +{ | |
| 317 | + struct rc5t583 *rc5t583 = dev_get_drvdata(dev); | |
| 318 | + return regmap_update_bits(rc5t583->regmap, reg, mask, val); | |
| 319 | +} | |
| 320 | + | |
| 290 | 321 | int rc5t583_ext_power_req_config(struct device *dev, int deepsleep_id, |
| 291 | 322 | int ext_pwr_req, int deepsleep_slot_nr); |
| 292 | 323 | int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base); |
| @@ -174,8 +174,35 @@ · 173 unmodified lines | ||
| 174 | 174 | #define TWL6040_SYSCLK_SEL_LPPLL 0 |
| 175 | 175 | #define TWL6040_SYSCLK_SEL_HPPLL 1 |
| 176 | 176 | |
| 177 | +struct twl6040_codec_data { | |
| 178 | + u16 hs_left_step; | |
| 179 | + u16 hs_right_step; | |
| 180 | + u16 hf_left_step; | |
| 181 | + u16 hf_right_step; | |
| 182 | +}; | |
| 183 | + | |
| 184 | +struct twl6040_vibra_data { | |
| 185 | + unsigned int vibldrv_res; /* left driver resistance */ | |
| 186 | + unsigned int vibrdrv_res; /* right driver resistance */ | |
| 187 | + unsigned int viblmotor_res; /* left motor resistance */ | |
| 188 | + unsigned int vibrmotor_res; /* right motor resistance */ | |
| 189 | + int vddvibl_uV; /* VDDVIBL volt, set 0 for fixed reg */ | |
| 190 | + int vddvibr_uV; /* VDDVIBR volt, set 0 for fixed reg */ | |
| 191 | +}; | |
| 192 | + | |
| 193 | +struct twl6040_platform_data { | |
| 194 | + int audpwron_gpio; /* audio power-on gpio */ | |
| 195 | + unsigned int irq_base; | |
| 196 | + | |
| 197 | + struct twl6040_codec_data *codec; | |
| 198 | + struct twl6040_vibra_data *vibra; | |
| 199 | +}; | |
| 200 | + | |
| 201 | +struct regmap; | |
| 202 | + | |
| 177 | 203 | struct twl6040 { |
| 178 | 204 | struct device *dev; |
| 205 | + struct regmap *regmap; | |
| 179 | 206 | struct mutex mutex; |
| 180 | 207 | struct mutex io_mutex; |
| 181 | 208 | struct mutex irq_mutex; |
| @@ -1393,29 +1393,20 @@ extern int install_special_mapping(struct mm_struct *mm, · 1392 unmodified lines | ||
| 1393 | 1393 | |
| 1394 | 1394 | extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); |
| 1395 | 1395 | |
| 1396 | −extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, | |
| 1397 | − unsigned long len, unsigned long prot, | |
| 1398 | − unsigned long flag, unsigned long pgoff); | |
| 1399 | 1396 | extern unsigned long mmap_region(struct file *file, unsigned long addr, |
| 1400 | 1397 | unsigned long len, unsigned long flags, |
| 1401 | 1398 | vm_flags_t vm_flags, unsigned long pgoff); |
| 1402 | − | |
| 1403 | −static inline unsigned long do_mmap(struct file *file, unsigned long addr, | |
| 1404 | − unsigned long len, unsigned long prot, | |
| 1405 | − unsigned long flag, unsigned long offset) | |
| 1406 | −{ | |
| 1407 | − unsigned long ret = -EINVAL; | |
| 1408 | − if ((offset + PAGE_ALIGN(len)) < offset) | |
| 1409 | − goto out; | |
| 1410 | − if (!(offset & ~PAGE_MASK)) | |
| 1411 | − ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT); | |
| 1412 | −out: | |
| 1413 | − return ret; | |
| 1414 | −} | |
| 1415 | − | |
| 1399 | +extern unsigned long do_mmap(struct file *, unsigned long, | |
| 1400 | + unsigned long, unsigned long, | |
| 1401 | + unsigned long, unsigned long); | |
| 1416 | 1402 | extern int do_munmap(struct mm_struct *, unsigned long, size_t); |
| 1417 | 1403 | |
| 1418 | −extern unsigned long do_brk(unsigned long, unsigned long); | |
| 1404 | +/* These take the mm semaphore themselves */ | |
| 1405 | +extern unsigned long vm_brk(unsigned long, unsigned long); | |
| 1406 | +extern int vm_munmap(unsigned long, size_t); | |
| 1407 | +extern unsigned long vm_mmap(struct file *, unsigned long, | |
| 1408 | + unsigned long, unsigned long, | |
| 1409 | + unsigned long, unsigned long); | |
| 1419 | 1410 | |
| 1420 | 1411 | /* truncate.c */ |
| 1421 | 1412 | extern void truncate_inode_pages(struct address_space *, loff_t); |
| @@ -481,7 +481,7 @@ struct mmc_driver { · 480 unmodified lines | ||
| 481 | 481 | struct device_driver drv; |
| 482 | 482 | int (*probe)(struct mmc_card *); |
| 483 | 483 | void (*remove)(struct mmc_card *); |
| 484 | − int (*suspend)(struct mmc_card *, pm_message_t); | |
| 484 | + int (*suspend)(struct mmc_card *); | |
| 485 | 485 | int (*resume)(struct mmc_card *); |
| 486 | 486 | }; |
| 487 | 487 | |
| @@ -312,6 +312,11 @@ struct nfs4_layoutreturn { · 311 unmodified lines | ||
| 312 | 312 | int rpc_status; |
| 313 | 313 | }; |
| 314 | 314 | |
| 315 | +struct stateowner_id { | |
| 316 | + __u64 create_time; | |
| 317 | + __u32 uniquifier; | |
| 318 | +}; | |
| 319 | + | |
| 315 | 320 | /* |
| 316 | 321 | * Arguments to the open call. |
| 317 | 322 | */ |
| @@ -321,7 +326,7 @@ struct nfs_openargs { · 3 unmodified lines | ||
| 321 | 326 | int open_flags; |
| 322 | 327 | fmode_t fmode; |
| 323 | 328 | __u64 clientid; |
| 324 | − __u64 id; | |
| 329 | + struct stateowner_id id; | |
| 325 | 330 | union { |
| 326 | 331 | struct { |
| 327 | 332 | struct iattr * attrs; /* UNCHECKED, GUARDED */ |
| @@ -1,3 +1,4 @@ | ||
| 1 | +header-y += cld.h | |
| 1 | 2 | header-y += debug.h |
| 2 | 3 | header-y += export.h |
| 3 | 4 | header-y += nfsfh.h |
| @@ -12,6 +12,8 @@ · 11 unmodified lines | ||
| 12 | 12 | #ifndef __LINUX_PINCTRL_MACHINE_H |
| 13 | 13 | #define __LINUX_PINCTRL_MACHINE_H |
| 14 | 14 | |
| 15 | +#include <linux/bug.h> | |
| 16 | + | |
| 15 | 17 | #include "pinctrl-state.h" |
| 16 | 18 | |
| 17 | 19 | enum pinctrl_map_type { |
| @@ -148,7 +150,7 @@ struct pinctrl_map { · 130 unmodified lines | ||
| 148 | 150 | #define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \ |
| 149 | 151 | PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs) |
| 150 | 152 | |
| 151 | −#ifdef CONFIG_PINMUX | |
| 153 | +#ifdef CONFIG_PINCTRL | |
| 152 | 154 | |
| 153 | 155 | extern int pinctrl_register_mappings(struct pinctrl_map const *map, |
| 154 | 156 | unsigned num_maps); |
| @@ -6,6 +6,7 @@ · 5 unmodified lines | ||
| 6 | 6 | #define PIPE_BUF_FLAG_LRU 0x01 /* page is on the LRU */ |
| 7 | 7 | #define PIPE_BUF_FLAG_ATOMIC 0x02 /* was atomically mapped */ |
| 8 | 8 | #define PIPE_BUF_FLAG_GIFT 0x04 /* page is a gift */ |
| 9 | +#define PIPE_BUF_FLAG_PACKET 0x08 /* read() as a packet */ | |
| 9 | 10 | |
| 10 | 11 | /** |
| 11 | 12 | * struct pipe_buffer - a linux kernel pipe buffer |
| @@ -238,11 +238,12 @@ enum { · 237 unmodified lines | ||
| 238 | 238 | /* |
| 239 | 239 | * The callback notifies userspace to release buffers when skb DMA is done in |
| 240 | 240 | * lower device, the skb last reference should be 0 when calling this. |
| 241 | − * The desc is used to track userspace buffer index. | |
| 241 | + * The ctx field is used to track device context. | |
| 242 | + * The desc field is used to track userspace buffer index. | |
| 242 | 243 | */ |
| 243 | 244 | struct ubuf_info { |
| 244 | − void (*callback)(void *); | |
| 245 | − void *arg; | |
| 245 | + void (*callback)(struct ubuf_info *); | |
| 246 | + void *ctx; | |
| 246 | 247 | unsigned long desc; |
| 247 | 248 | }; |
| 248 | 249 | |
| @@ -254,7 +254,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 253 unmodified lines | ||
| 254 | 254 | * driver is finished with this message, it must call |
| 255 | 255 | * spi_finalize_current_message() so the subsystem can issue the next |
| 256 | 256 | * transfer |
| 257 | − * @prepare_transfer_hardware: there are currently no more messages on the | |
| 257 | + * @unprepare_transfer_hardware: there are currently no more messages on the | |
| 258 | 258 | * queue so the subsystem notifies the driver that it may relax the |
| 259 | 259 | * hardware by issuing this call |
| 260 | 260 | * |
| @@ -126,6 +126,8 @@ struct usb_hcd { · 125 unmodified lines | ||
| 126 | 126 | unsigned wireless:1; /* Wireless USB HCD */ |
| 127 | 127 | unsigned authorized_default:1; |
| 128 | 128 | unsigned has_tt:1; /* Integrated TT in root hub */ |
| 129 | + unsigned broken_pci_sleep:1; /* Don't put the | |
| 130 | + controller in PCI-D3 for system sleep */ | |
| 129 | 131 | |
| 130 | 132 | unsigned int irq; /* irq allocated */ |
| 131 | 133 | void __iomem *regs; /* device memory/io */ |
| @@ -94,6 +94,7 @@ struct usb_phy { · 93 unmodified lines | ||
| 94 | 94 | |
| 95 | 95 | struct usb_otg *otg; |
| 96 | 96 | |
| 97 | + struct device *io_dev; | |
| 97 | 98 | struct usb_phy_io_ops *io_ops; |
| 98 | 99 | void __iomem *io_priv; |
| 99 | 100 | |
| @@ -26,13 +26,14 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, · 25 unmodified lines | ||
| 26 | 26 | PGFREE, PGACTIVATE, PGDEACTIVATE, |
| 27 | 27 | PGFAULT, PGMAJFAULT, |
| 28 | 28 | FOR_ALL_ZONES(PGREFILL), |
| 29 | − FOR_ALL_ZONES(PGSTEAL), | |
| 29 | + FOR_ALL_ZONES(PGSTEAL_KSWAPD), | |
| 30 | + FOR_ALL_ZONES(PGSTEAL_DIRECT), | |
| 30 | 31 | FOR_ALL_ZONES(PGSCAN_KSWAPD), |
| 31 | 32 | FOR_ALL_ZONES(PGSCAN_DIRECT), |
| 32 | 33 | #ifdef CONFIG_NUMA |
| 33 | 34 | PGSCAN_ZONE_RECLAIM_FAILED, |
| 34 | 35 | #endif |
| 35 | − PGINODESTEAL, SLABS_SCANNED, KSWAPD_STEAL, KSWAPD_INODESTEAL, | |
| 36 | + PGINODESTEAL, SLABS_SCANNED, KSWAPD_INODESTEAL, | |
| 36 | 37 | KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY, |
| 37 | 38 | KSWAPD_SKIP_CONGESTION_WAIT, |
| 38 | 39 | PAGEOUTRUN, ALLOCSTALL, PGROTATED, |
| @@ -36,7 +36,11 @@ struct dst_entry { · 35 unmodified lines | ||
| 36 | 36 | struct net_device *dev; |
| 37 | 37 | struct dst_ops *ops; |
| 38 | 38 | unsigned long _metrics; |
| 39 | − unsigned long expires; | |
| 39 | + union { | |
| 40 | + unsigned long expires; | |
| 41 | + /* point to where the dst_entry copied from */ | |
| 42 | + struct dst_entry *from; | |
| 43 | + }; | |
| 40 | 44 | struct dst_entry *path; |
| 41 | 45 | struct neighbour __rcu *_neighbour; |
| 42 | 46 | #ifdef CONFIG_XFRM |
| @@ -123,6 +123,54 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) · 122 unmodified lines | ||
| 123 | 123 | return ((struct rt6_info *)dst)->rt6i_idev; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | +static inline void rt6_clean_expires(struct rt6_info *rt) | |
| 127 | +{ | |
| 128 | + if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from) | |
| 129 | + dst_release(rt->dst.from); | |
| 130 | + | |
| 131 | + rt->rt6i_flags &= ~RTF_EXPIRES; | |
| 132 | + rt->dst.from = NULL; | |
| 133 | +} | |
| 134 | + | |
| 135 | +static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires) | |
| 136 | +{ | |
| 137 | + if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from) | |
| 138 | + dst_release(rt->dst.from); | |
| 139 | + | |
| 140 | + rt->rt6i_flags |= RTF_EXPIRES; | |
| 141 | + rt->dst.expires = expires; | |
| 142 | +} | |
| 143 | + | |
| 144 | +static inline void rt6_update_expires(struct rt6_info *rt, int timeout) | |
| 145 | +{ | |
| 146 | + if (!(rt->rt6i_flags & RTF_EXPIRES)) { | |
| 147 | + if (rt->dst.from) | |
| 148 | + dst_release(rt->dst.from); | |
| 149 | + /* dst_set_expires relies on expires == 0 | |
| 150 | + * if it has not been set previously. | |
| 151 | + */ | |
| 152 | + rt->dst.expires = 0; | |
| 153 | + } | |
| 154 | + | |
| 155 | + dst_set_expires(&rt->dst, timeout); | |
| 156 | + rt->rt6i_flags |= RTF_EXPIRES; | |
| 157 | +} | |
| 158 | + | |
| 159 | +static inline void rt6_set_from(struct rt6_info *rt, struct rt6_info *from) | |
| 160 | +{ | |
| 161 | + struct dst_entry *new = (struct dst_entry *) from; | |
| 162 | + | |
| 163 | + if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from) { | |
| 164 | + if (new == rt->dst.from) | |
| 165 | + return; | |
| 166 | + dst_release(rt->dst.from); | |
| 167 | + } | |
| 168 | + | |
| 169 | + rt->rt6i_flags &= ~RTF_EXPIRES; | |
| 170 | + rt->dst.from = new; | |
| 171 | + dst_hold(new); | |
| 172 | +} | |
| 173 | + | |
| 126 | 174 | struct fib6_walker_t { |
| 127 | 175 | struct list_head lh; |
| 128 | 176 | struct fib6_node *root, *node; |
| @@ -245,7 +245,7 @@ static inline unsigned long red_calc_qavg_from_idle_time(const struct red_parms · 244 unmodified lines | ||
| 245 | 245 | * |
| 246 | 246 | * dummy packets as a burst after idle time, i.e. |
| 247 | 247 | * |
| 248 | − * p->qavg *= (1-W)^m | |
| 248 | + * v->qavg *= (1-W)^m | |
| 249 | 249 | * |
| 250 | 250 | * This is an apparently overcomplicated solution (f.e. we have to |
| 251 | 251 | * precompute a table to make this calculation in reasonable time) |
| @@ -279,7 +279,7 @@ static inline unsigned long red_calc_qavg_no_idle_time(const struct red_parms *p · 27 unmodified lines | ||
| 279 | 279 | unsigned int backlog) |
| 280 | 280 | { |
| 281 | 281 | /* |
| 282 | − * NOTE: p->qavg is fixed point number with point at Wlog. | |
| 282 | + * NOTE: v->qavg is fixed point number with point at Wlog. | |
| 283 | 283 | * The formula below is equvalent to floating point |
| 284 | 284 | * version: |
| 285 | 285 | * |
| @@ -390,7 +390,7 @@ static inline void red_adaptative_algo(struct red_parms *p, struct red_vars *v) · 104 unmodified lines | ||
| 390 | 390 | if (red_is_idling(v)) |
| 391 | 391 | qavg = red_calc_qavg_from_idle_time(p, v); |
| 392 | 392 | |
| 393 | − /* p->qavg is fixed point number with point at Wlog */ | |
| 393 | + /* v->qavg is fixed point number with point at Wlog */ | |
| 394 | 394 | qavg >>= p->Wlog; |
| 395 | 395 | |
| 396 | 396 | if (qavg > p->target_max && p->max_P <= MAX_P_MAX) |
| @@ -246,6 +246,7 @@ struct cg_proto; · 245 unmodified lines | ||
| 246 | 246 | * @sk_user_data: RPC layer private data |
| 247 | 247 | * @sk_sndmsg_page: cached page for sendmsg |
| 248 | 248 | * @sk_sndmsg_off: cached offset for sendmsg |
| 249 | + * @sk_peek_off: current peek_offset value | |
| 249 | 250 | * @sk_send_head: front of stuff to transmit |
| 250 | 251 | * @sk_security: used by security modules |
| 251 | 252 | * @sk_mark: generic packet mark |
| @@ -217,11 +217,29 @@ struct domain_device { · 216 unmodified lines | ||
| 217 | 217 | struct kref kref; |
| 218 | 218 | }; |
| 219 | 219 | |
| 220 | −struct sas_discovery_event { | |
| 220 | +struct sas_work { | |
| 221 | + struct list_head drain_node; | |
| 221 | 222 | struct work_struct work; |
| 223 | +}; | |
| 224 | + | |
| 225 | +static inline void INIT_SAS_WORK(struct sas_work *sw, void (*fn)(struct work_struct *)) | |
| 226 | +{ | |
| 227 | + INIT_WORK(&sw->work, fn); | |
| 228 | + INIT_LIST_HEAD(&sw->drain_node); | |
| 229 | +} | |
| 230 | + | |
| 231 | +struct sas_discovery_event { | |
| 232 | + struct sas_work work; | |
| 222 | 233 | struct asd_sas_port *port; |
| 223 | 234 | }; |
| 224 | 235 | |
| 236 | +static inline struct sas_discovery_event *to_sas_discovery_event(struct work_struct *work) | |
| 237 | +{ | |
| 238 | + struct sas_discovery_event *ev = container_of(work, typeof(*ev), work.work); | |
| 239 | + | |
| 240 | + return ev; | |
| 241 | +} | |
| 242 | + | |
| 225 | 243 | struct sas_discovery { |
| 226 | 244 | struct sas_discovery_event disc_work[DISC_NUM_EVENTS]; |
| 227 | 245 | unsigned long pending; |
| @@ -244,7 +262,7 @@ struct asd_sas_port { · 16 unmodified lines | ||
| 244 | 262 | struct list_head destroy_list; |
| 245 | 263 | enum sas_linkrate linkrate; |
| 246 | 264 | |
| 247 | − struct work_struct work; | |
| 265 | + struct sas_work work; | |
| 248 | 266 | |
| 249 | 267 | /* public: */ |
| 250 | 268 | int id; |
| @@ -270,10 +288,17 @@ struct asd_sas_port { · 19 unmodified lines | ||
| 270 | 288 | }; |
| 271 | 289 | |
| 272 | 290 | struct asd_sas_event { |
| 273 | − struct work_struct work; | |
| 291 | + struct sas_work work; | |
| 274 | 292 | struct asd_sas_phy *phy; |
| 275 | 293 | }; |
| 276 | 294 | |
| 295 | +static inline struct asd_sas_event *to_asd_sas_event(struct work_struct *work) | |
| 296 | +{ | |
| 297 | + struct asd_sas_event *ev = container_of(work, typeof(*ev), work.work); | |
| 298 | + | |
| 299 | + return ev; | |
| 300 | +} | |
| 301 | + | |
| 277 | 302 | /* The phy pretty much is controlled by the LLDD. |
| 278 | 303 | * The class only reads those fields. |
| 279 | 304 | */ |
| @@ -333,10 +358,17 @@ struct scsi_core { · 53 unmodified lines | ||
| 333 | 358 | }; |
| 334 | 359 | |
| 335 | 360 | struct sas_ha_event { |
| 336 | − struct work_struct work; | |
| 361 | + struct sas_work work; | |
| 337 | 362 | struct sas_ha_struct *ha; |
| 338 | 363 | }; |
| 339 | 364 | |
| 365 | +static inline struct sas_ha_event *to_sas_ha_event(struct work_struct *work) | |
| 366 | +{ | |
| 367 | + struct sas_ha_event *ev = container_of(work, typeof(*ev), work.work); | |
| 368 | + | |
| 369 | + return ev; | |
| 370 | +} | |
| 371 | + | |
| 340 | 372 | enum sas_ha_state { |
| 341 | 373 | SAS_HA_REGISTERED, |
| 342 | 374 | SAS_HA_DRAINING, |
| @@ -37,7 +37,7 @@ static inline int dev_is_sata(struct domain_device *dev) · 36 unmodified lines | ||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy); |
| 40 | −int sas_ata_init_host_and_port(struct domain_device *found_dev); | |
| 40 | +int sas_ata_init(struct domain_device *dev); | |
| 41 | 41 | void sas_ata_task_abort(struct sas_task *task); |
| 42 | 42 | void sas_ata_strategy_handler(struct Scsi_Host *shost); |
| 43 | 43 | void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, |
| @@ -52,7 +52,7 @@ static inline int dev_is_sata(struct domain_device *dev) · 8 unmodified lines | ||
| 52 | 52 | { |
| 53 | 53 | return 0; |
| 54 | 54 | } |
| 55 | −static inline int sas_ata_init_host_and_port(struct domain_device *found_dev) | |
| 55 | +static inline int sas_ata_init(struct domain_device *dev) | |
| 56 | 56 | { |
| 57 | 57 | return 0; |
| 58 | 58 | } |