History

Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and 'versatile' into for-linus

Russell King committed 14 years ago

Commit ddf90a27 parents dfb8518 5693188 56cb248 d098bc7 34fd421 90cf241 d12379a630 files · +5966 −3821Browse files

Showing the changes to include (29 of 630 files). Show all

Unified · Split

29 files
  1. include/asm-generic/siginfo.h +11 −3
  2. include/linux/efi.h +12 −1
  3. include/linux/fuse.h +1 −1
  4. include/linux/gpio-pxa.h +4 −0
  5. include/linux/hsi/hsi.h +17 −14
  6. include/linux/i2c/twl.h +0 −12
  7. include/linux/irq.h +7 −0
  8. include/linux/kvm_host.h +6 −0
  9. include/linux/libata.h +2 −1
  10. include/linux/mfd/db5500-prcmu.h +37 −51
  11. include/linux/mfd/rc5t583.h +39 −8
  12. include/linux/mfd/twl6040.h +27 −0
  13. include/linux/mm.h +9 −18
  14. include/linux/mmc/card.h +1 −1
  15. include/linux/nfs_xdr.h +6 −1
  16. include/linux/nfsd/Kbuild +1 −0
  17. include/linux/pinctrl/machine.h +3 −1
  18. include/linux/pipe_fs_i.h +1 −0
  19. include/linux/skbuff.h +4 −3
  20. include/linux/spi/spi.h +1 −1
  21. include/linux/usb/hcd.h +2 −0
  22. include/linux/usb/otg.h +1 −0
  23. include/linux/vm_event_item.h +3 −2
  24. include/net/dst.h +5 −1
  25. include/net/ip6_fib.h +48 −0
  26. include/net/red.h +3 −3
  27. include/net/sock.h +1 −0
  28. include/scsi/libsas.h +36 −4
  29. include/scsi/sas_ata.h +2 −2
include/asm-generic/siginfo.h+11−3
@@ -35,6 +35,14 @@ typedef union sigval { · 34 unmodified lines
35#define __ARCH_SI_BAND_T long35#define __ARCH_SI_BAND_T long
36#endif36#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#ifndef HAVE_ARCH_SIGINFO_T46#ifndef HAVE_ARCH_SIGINFO_T
39 47
40typedef struct siginfo {48typedef struct siginfo {
@@ -72,8 +80,8 @@ typedef struct siginfo { · 31 unmodified lines
72 __kernel_pid_t _pid; /* which child */80 __kernel_pid_t _pid; /* which child */
73 __ARCH_SI_UID_T _uid; /* sender's uid */81 __ARCH_SI_UID_T _uid; /* sender's uid */
74 int _status; /* exit code */82 int _status; /* exit code */
75 __kernel_clock_t _utime;83 __ARCH_SI_CLOCK_T _utime;
76 __kernel_clock_t _stime;84 __ARCH_SI_CLOCK_T _stime;
77 } _sigchld;85 } _sigchld;
78 86
79 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */87 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
@@ -91,7 +99,7 @@ typedef struct siginfo { · 11 unmodified lines
91 int _fd;99 int _fd;
92 } _sigpoll;100 } _sigpoll;
93 } _sifields;101 } _sifields;
94} siginfo_t;102} __ARCH_SI_ATTRIBUTES siginfo_t;
95 103
96#endif104#endif
97 105
include/linux/efi.h+12−1
@@ -554,7 +554,18 @@ extern int __init efi_setup_pcdp_console(char *); · 553 unmodified lines
554#define EFI_VARIABLE_NON_VOLATILE 0x0000000000000001554#define EFI_VARIABLE_NON_VOLATILE 0x0000000000000001
555#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002555#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002
556#define EFI_VARIABLE_RUNTIME_ACCESS 0x0000000000000004556#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 * The type of search to perform when calling boottime->locate_handle570 * The type of search to perform when calling boottime->locate_handle
560 */571 */
include/linux/fuse.h+1−1
@@ -593,7 +593,7 @@ struct fuse_dirent { · 592 unmodified lines
593 __u64 off;593 __u64 off;
594 __u32 namelen;594 __u32 namelen;
595 __u32 type;595 __u32 type;
596 char name[0];596 char name[];
597};597};
598 598
599#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)599#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
include/linux/gpio-pxa.h+4−0
@@ -13,4 +13,8 @@ extern int pxa_last_gpio; · 12 unmodified lines
13 13
14extern int pxa_irq_to_gpio(int irq);14extern int pxa_irq_to_gpio(int irq);
15 15
16struct pxa_gpio_platform_data {
17 int (*gpio_set_wake)(unsigned int gpio, unsigned int on);
18};
19
16#endif /* __GPIO_PXA_H */20#endif /* __GPIO_PXA_H */
include/linux/hsi/hsi.h+17−14
@@ -26,9 +26,9 @@ · 25 unmodified lines
26#include <linux/device.h>26#include <linux/device.h>
27#include <linux/mutex.h>27#include <linux/mutex.h>
28#include <linux/scatterlist.h>28#include <linux/scatterlist.h>
29#include <linux/spinlock.h>
30#include <linux/list.h>29#include <linux/list.h>
31#include <linux/module.h>30#include <linux/module.h>
31#include <linux/notifier.h>
32 32
33/* HSI message ttype */33/* HSI message ttype */
34#define HSI_MSG_READ 034#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 * @device: Driver model representation of the device121 * @device: Driver model representation of the device
122 * @tx_cfg: HSI TX configuration122 * @tx_cfg: HSI TX configuration
123 * @rx_cfg: HSI RX configuration123 * @rx_cfg: HSI RX configuration
124 * @hsi_start_rx: Called after incoming wake line goes high124 * @e_handler: Callback for handling port events (RX Wake High/Low)
125 * @hsi_stop_rx: Called after incoming wake line goes low125 * @pclaimed: Keeps tracks if the clients claimed its associated HSI port
126 * @nb: Notifier block for port events
126 */127 */
127struct hsi_client {128struct hsi_client {
128 struct device device;129 struct device device;
129 struct hsi_config tx_cfg;130 struct hsi_config tx_cfg;
130 struct hsi_config rx_cfg;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 /* private: */132 /* private: */
133 void (*ehandler)(struct hsi_client *, unsigned long);
134 unsigned int pclaimed:1;134 unsigned int pclaimed:1;
135 struct list_head link;135 struct notifier_block nb;
136};136};
137 137
138#define to_hsi_client(dev) container_of(dev, struct hsi_client, device)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 return dev_get_drvdata(&cl->device);147 return dev_get_drvdata(&cl->device);
148}148}
149 149
150int hsi_register_port_event(struct hsi_client *cl,
151 void (*handler)(struct hsi_client *, unsigned long));
152int hsi_unregister_port_event(struct hsi_client *cl);
153
150/**154/**
151 * struct hsi_client_driver - Driver associated to an HSI client155 * struct hsi_client_driver - Driver associated to an HSI client
152 * @driver: Driver model representation of the driver156 * @driver: Driver model representation of the driver
@@ -214,8 +218,7 @@ void hsi_free_msg(struct hsi_msg *msg); · 61 unmodified lines
214 * @start_tx: Callback to inform that a client wants to TX data218 * @start_tx: Callback to inform that a client wants to TX data
215 * @stop_tx: Callback to inform that a client no longer wishes to TX data219 * @stop_tx: Callback to inform that a client no longer wishes to TX data
216 * @release: Callback to inform that a client no longer uses the port220 * @release: Callback to inform that a client no longer uses the port
217 * @clients: List of hsi_clients using the port.221 * @n_head: Notifier chain for signaling port events to the clients.
218 * @clock: Lock to serialize access to the clients list.
219 */222 */
220struct hsi_port {223struct hsi_port {
221 struct device device;224 struct device device;
@@ -231,14 +234,14 @@ struct hsi_port { · 9 unmodified lines
231 int (*start_tx)(struct hsi_client *cl);234 int (*start_tx)(struct hsi_client *cl);
232 int (*stop_tx)(struct hsi_client *cl);235 int (*stop_tx)(struct hsi_client *cl);
233 int (*release)(struct hsi_client *cl);236 int (*release)(struct hsi_client *cl);
234 struct list_head clients;237 /* private */
235 spinlock_t clock;238 struct atomic_notifier_head n_head;
236};239};
237 240
238#define to_hsi_port(dev) container_of(dev, struct hsi_port, device)241#define to_hsi_port(dev) container_of(dev, struct hsi_port, device)
239#define hsi_get_port(cl) to_hsi_port((cl)->device.parent)242#define hsi_get_port(cl) to_hsi_port((cl)->device.parent)
240 243
241void hsi_event(struct hsi_port *port, unsigned int event);244int hsi_event(struct hsi_port *port, unsigned long event);
242int hsi_claim_port(struct hsi_client *cl, unsigned int share);245int hsi_claim_port(struct hsi_client *cl, unsigned int share);
243void hsi_release_port(struct hsi_client *cl);246void hsi_release_port(struct hsi_client *cl);
244 247
@@ -270,13 +273,13 @@ struct hsi_controller { · 25 unmodified lines
270 struct module *owner;273 struct module *owner;
271 unsigned int id;274 unsigned int id;
272 unsigned int num_ports;275 unsigned int num_ports;
273 struct hsi_port *port;276 struct hsi_port **port;
274};277};
275 278
276#define to_hsi_controller(dev) container_of(dev, struct hsi_controller, device)279#define to_hsi_controller(dev) container_of(dev, struct hsi_controller, device)
277 280
278struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags);281struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags);
279void hsi_free_controller(struct hsi_controller *hsi);282void hsi_put_controller(struct hsi_controller *hsi);
280int hsi_register_controller(struct hsi_controller *hsi);283int hsi_register_controller(struct hsi_controller *hsi);
281void hsi_unregister_controller(struct hsi_controller *hsi);284void 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
294static inline struct hsi_port *hsi_find_port_num(struct hsi_controller *hsi,297static inline struct hsi_port *hsi_find_port_num(struct hsi_controller *hsi,
295 unsigned int num)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/*
include/linux/i2c/twl.h+0−12
@@ -666,23 +666,11 @@ struct twl4030_codec_data { · 665 unmodified lines
666 unsigned int check_defaults:1;666 unsigned int check_defaults:1;
667 unsigned int reset_registers:1;667 unsigned int reset_registers:1;
668 unsigned int hs_extmute:1;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 void (*set_hs_extmute)(int mute);669 void (*set_hs_extmute)(int mute);
674};670};
675 671
676struct twl4030_vibra_data {672struct twl4030_vibra_data {
677 unsigned int coexist;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
688struct twl4030_audio_data {676struct twl4030_audio_data {
include/linux/irq.h+7−0
@@ -49,6 +49,12 @@ typedef void (*irq_preflow_handler_t)(struct irq_data *data); · 48 unmodified lines
49 * IRQ_TYPE_LEVEL_LOW - low level triggered49 * IRQ_TYPE_LEVEL_LOW - low level triggered
50 * IRQ_TYPE_LEVEL_MASK - Mask to filter out the level bits50 * IRQ_TYPE_LEVEL_MASK - Mask to filter out the level bits
51 * IRQ_TYPE_SENSE_MASK - Mask for all the above bits51 * 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 * IRQ_TYPE_PROBE - Special flag for probing in progress58 * IRQ_TYPE_PROBE - Special flag for probing in progress
53 *59 *
54 * Bits which can be modified via irq_set/clear/modify_status_flags()60 * Bits which can be modified via irq_set/clear/modify_status_flags()
@@ -77,6 +83,7 @@ enum { · 22 unmodified lines
77 IRQ_TYPE_LEVEL_LOW = 0x00000008,83 IRQ_TYPE_LEVEL_LOW = 0x00000008,
78 IRQ_TYPE_LEVEL_MASK = (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH),84 IRQ_TYPE_LEVEL_MASK = (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH),
79 IRQ_TYPE_SENSE_MASK = 0x0000000f,85 IRQ_TYPE_SENSE_MASK = 0x0000000f,
86 IRQ_TYPE_DEFAULT = IRQ_TYPE_SENSE_MASK,
80 87
81 IRQ_TYPE_PROBE = 0x00000010,88 IRQ_TYPE_PROBE = 0x00000010,
82 89
include/linux/kvm_host.h+6−0
@@ -596,6 +596,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id); · 595 unmodified lines
596 596
597#ifdef CONFIG_IOMMU_API597#ifdef CONFIG_IOMMU_API
598int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot);598int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
599void kvm_iommu_unmap_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
599int kvm_iommu_map_guest(struct kvm *kvm);600int kvm_iommu_map_guest(struct kvm *kvm);
600int kvm_iommu_unmap_guest(struct kvm *kvm);601int kvm_iommu_unmap_guest(struct kvm *kvm);
601int kvm_assign_device(struct kvm *kvm,602int kvm_assign_device(struct kvm *kvm,
@@ -609,6 +610,11 @@ static inline int kvm_iommu_map_pages(struct kvm *kvm, · 7 unmodified lines
609 return 0;610 return 0;
610}611}
611 612
613static inline void kvm_iommu_unmap_pages(struct kvm *kvm,
614 struct kvm_memory_slot *slot)
615{
616}
617
612static inline int kvm_iommu_map_guest(struct kvm *kvm)618static inline int kvm_iommu_map_guest(struct kvm *kvm)
613{619{
614 return -ENODEV;620 return -ENODEV;
include/linux/libata.h+2−1
@@ -996,7 +996,8 @@ extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev, · 995 unmodified lines
996extern void ata_sas_port_destroy(struct ata_port *);996extern void ata_sas_port_destroy(struct ata_port *);
997extern struct ata_port *ata_sas_port_alloc(struct ata_host *,997extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
998 struct ata_port_info *, struct Scsi_Host *);998 struct ata_port_info *, struct Scsi_Host *);
999extern int ata_sas_async_port_init(struct ata_port *);999extern void ata_sas_async_probe(struct ata_port *ap);
1000extern int ata_sas_sync_probe(struct ata_port *ap);
1000extern int ata_sas_port_init(struct ata_port *);1001extern int ata_sas_port_init(struct ata_port *);
1001extern int ata_sas_port_start(struct ata_port *ap);1002extern int ata_sas_port_start(struct ata_port *ap);
1002extern void ata_sas_port_stop(struct ata_port *ap);1003extern void ata_sas_port_stop(struct ata_port *ap);
include/linux/mfd/db5500-prcmu.h+37−51
@@ -8,41 +8,14 @@ · 7 unmodified lines
8#ifndef __MFD_DB5500_PRCMU_H8#ifndef __MFD_DB5500_PRCMU_H
9#define __MFD_DB5500_PRCMU_H9#define __MFD_DB5500_PRCMU_H
10 10
11#ifdef CONFIG_MFD_DB5500_PRCMU11static inline int prcmu_resetout(u8 resoutn, u8 state)
12
13void db5500_prcmu_early_init(void);
14int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state);
15int db5500_prcmu_set_display_clocks(void);
16int db5500_prcmu_disable_dsipll(void);
17int db5500_prcmu_enable_dsipll(void);
18int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
19int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
20void db5500_prcmu_enable_wakeups(u32 wakeups);
21int db5500_prcmu_request_clock(u8 clock, bool enable);
22void db5500_prcmu_config_abb_event_readout(u32 abb_events);
23void db5500_prcmu_get_abb_event_buffer(void __iomem **buf);
24int prcmu_resetout(u8 resoutn, u8 state);
25int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk,
26 bool keep_ap_pll);
27int db5500_prcmu_config_esram0_deep_sleep(u8 state);
28void db5500_prcmu_system_reset(u16 reset_code);
29u16 db5500_prcmu_get_reset_code(void);
30bool db5500_prcmu_is_ac_wake_requested(void);
31int db5500_prcmu_set_arm_opp(u8 opp);
32int db5500_prcmu_get_arm_opp(void);
33
34#else /* !CONFIG_UX500_SOC_DB5500 */
35
36static inline void db5500_prcmu_early_init(void) {}
37
38static inline int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
39{12{
40 return -ENOSYS;13 return 0;
41}14}
42 15
43static inline int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)16static inline int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state)
44{17{
45 return -ENOSYS;18 return 0;
46}19}
47 20
48static inline int db5500_prcmu_request_clock(u8 clock, bool enable)21static 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 return 0;23 return 0;
51}24}
52 25
53static inline int db5500_prcmu_set_display_clocks(void)26static inline int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk,
27 bool keep_ap_pll)
54{28{
55 return 0;29 return 0;
56}30}
57 31
58static inline int db5500_prcmu_disable_dsipll(void)32static inline int db5500_prcmu_config_esram0_deep_sleep(u8 state)
59{33{
60 return 0;34 return 0;
61}35}
62 36
63static inline int db5500_prcmu_enable_dsipll(void)37static inline u16 db5500_prcmu_get_reset_code(void)
64{38{
65 return 0;39 return 0;
66}40}
67 41
68static inline int db5500_prcmu_config_esram0_deep_sleep(u8 state)42static inline bool db5500_prcmu_is_ac_wake_requested(void)
69{43{
70 return 0;44 return 0;
71}45}
72 46
73static inline void db5500_prcmu_enable_wakeups(u32 wakeups) {}47static inline int db5500_prcmu_set_arm_opp(u8 opp)
74
75static inline int prcmu_resetout(u8 resoutn, u8 state)
76{48{
77 return 0;49 return 0;
78}50}
79 51
80static inline int db5500_prcmu_set_epod(u16 epod_id, u8 epod_state)52static inline int db5500_prcmu_get_arm_opp(void)
81{53{
82 return 0;54 return 0;
83}55}
84 56
85static inline void db5500_prcmu_get_abb_event_buffer(void __iomem **buf) {}
86static inline void db5500_prcmu_config_abb_event_readout(u32 abb_events) {}57static inline void db5500_prcmu_config_abb_event_readout(u32 abb_events) {}
87 58
88static inline int db5500_prcmu_set_power_state(u8 state, bool keep_ulp_clk,59static inline void db5500_prcmu_get_abb_event_buffer(void __iomem **buf) {}
89 bool keep_ap_pll)
90{
91 return 0;
92}
93 60
94static inline void db5500_prcmu_system_reset(u16 reset_code) {}61static inline void db5500_prcmu_system_reset(u16 reset_code) {}
95 62
96static inline u16 db5500_prcmu_get_reset_code(void)63static inline void db5500_prcmu_enable_wakeups(u32 wakeups) {}
64
65#ifdef CONFIG_MFD_DB5500_PRCMU
66
67void db5500_prcmu_early_init(void);
68int db5500_prcmu_set_display_clocks(void);
69int db5500_prcmu_disable_dsipll(void);
70int db5500_prcmu_enable_dsipll(void);
71int db5500_prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
72int db5500_prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
73
74#else /* !CONFIG_UX500_SOC_DB5500 */
75
76static inline void db5500_prcmu_early_init(void) {}
77
78static 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
101static inline bool db5500_prcmu_is_ac_wake_requested(void)83static 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
106static inline int db5500_prcmu_set_arm_opp(u8 opp)88static inline int db5500_prcmu_set_display_clocks(void)
107{89{
108 return 0;90 return 0;
109}91}
110 92
111static inline int db5500_prcmu_get_arm_opp(void)93static inline int db5500_prcmu_disable_dsipll(void)
112{94{
113 return 0;95 return 0;
114}96}
115 97
98static inline int db5500_prcmu_enable_dsipll(void)
99{
100 return 0;
101}
116 102
117#endif /* CONFIG_MFD_DB5500_PRCMU */103#endif /* CONFIG_MFD_DB5500_PRCMU */
118 104
include/linux/mfd/rc5t583.h+39−8
@@ -26,6 +26,7 @@ · 25 unmodified lines
26 26
27#include <linux/mutex.h>27#include <linux/mutex.h>
28#include <linux/types.h>28#include <linux/types.h>
29#include <linux/regmap.h>
29 30
30#define RC5T583_MAX_REGS 0xF831#define RC5T583_MAX_REGS 0xF8
31 32
@@ -279,14 +280,44 @@ struct rc5t583_platform_data { · 247 unmodified lines
279 bool enable_shutdown;280 bool enable_shutdown;
280};281};
281 282
282int rc5t583_write(struct device *dev, u8 reg, uint8_t val);283static inline int rc5t583_write(struct device *dev, uint8_t reg, uint8_t val)
283int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val);284{
284int rc5t583_set_bits(struct device *dev, unsigned int reg,285 struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
285 unsigned int bit_mask);286 return regmap_write(rc5t583->regmap, reg, val);
286int rc5t583_clear_bits(struct device *dev, unsigned int reg,287}
287 unsigned int bit_mask);288
288int rc5t583_update(struct device *dev, unsigned int reg,289static inline int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val)
289 unsigned int val, unsigned int mask);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
300static 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
307static 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
314static 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
290int rc5t583_ext_power_req_config(struct device *dev, int deepsleep_id,321int rc5t583_ext_power_req_config(struct device *dev, int deepsleep_id,
291 int ext_pwr_req, int deepsleep_slot_nr);322 int ext_pwr_req, int deepsleep_slot_nr);
292int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base);323int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base);
include/linux/mfd/twl6040.h+27−0
@@ -174,8 +174,35 @@ · 173 unmodified lines
174#define TWL6040_SYSCLK_SEL_LPPLL 0174#define TWL6040_SYSCLK_SEL_LPPLL 0
175#define TWL6040_SYSCLK_SEL_HPPLL 1175#define TWL6040_SYSCLK_SEL_HPPLL 1
176 176
177struct 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
184struct 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
193struct 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
201struct regmap;
202
177struct twl6040 {203struct twl6040 {
178 struct device *dev;204 struct device *dev;
205 struct regmap *regmap;
179 struct mutex mutex;206 struct mutex mutex;
180 struct mutex io_mutex;207 struct mutex io_mutex;
181 struct mutex irq_mutex;208 struct mutex irq_mutex;
include/linux/mm.h+9−18
@@ -1393,29 +1393,20 @@ extern int install_special_mapping(struct mm_struct *mm, · 1392 unmodified lines
1393 1393
1394extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);1394extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
1395 1395
1396extern 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);
1399extern unsigned long mmap_region(struct file *file, unsigned long addr,1396extern unsigned long mmap_region(struct file *file, unsigned long addr,
1400 unsigned long len, unsigned long flags,1397 unsigned long len, unsigned long flags,
1401 vm_flags_t vm_flags, unsigned long pgoff);1398 vm_flags_t vm_flags, unsigned long pgoff);
1402 1399extern unsigned long do_mmap(struct file *, unsigned long,
1403static inline unsigned long do_mmap(struct file *file, unsigned long addr,1400 unsigned long, unsigned long,
1404 unsigned long len, unsigned long prot,1401 unsigned long, unsigned long);
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);
1412out:
1413 return ret;
1414}
1415
1416extern int do_munmap(struct mm_struct *, unsigned long, size_t);1402extern int do_munmap(struct mm_struct *, unsigned long, size_t);
1417 1403
1418extern unsigned long do_brk(unsigned long, unsigned long);1404/* These take the mm semaphore themselves */
1405extern unsigned long vm_brk(unsigned long, unsigned long);
1406extern int vm_munmap(unsigned long, size_t);
1407extern unsigned long vm_mmap(struct file *, unsigned long,
1408 unsigned long, unsigned long,
1409 unsigned long, unsigned long);
1419 1410
1420/* truncate.c */1411/* truncate.c */
1421extern void truncate_inode_pages(struct address_space *, loff_t);1412extern void truncate_inode_pages(struct address_space *, loff_t);
include/linux/mmc/card.h+1−1
@@ -481,7 +481,7 @@ struct mmc_driver { · 480 unmodified lines
481 struct device_driver drv;481 struct device_driver drv;
482 int (*probe)(struct mmc_card *);482 int (*probe)(struct mmc_card *);
483 void (*remove)(struct mmc_card *);483 void (*remove)(struct mmc_card *);
484 int (*suspend)(struct mmc_card *, pm_message_t);484 int (*suspend)(struct mmc_card *);
485 int (*resume)(struct mmc_card *);485 int (*resume)(struct mmc_card *);
486};486};
487 487
include/linux/nfs_xdr.h+6−1
@@ -312,6 +312,11 @@ struct nfs4_layoutreturn { · 311 unmodified lines
312 int rpc_status;312 int rpc_status;
313};313};
314 314
315struct stateowner_id {
316 __u64 create_time;
317 __u32 uniquifier;
318};
319
315/*320/*
316 * Arguments to the open call.321 * Arguments to the open call.
317 */322 */
@@ -321,7 +326,7 @@ struct nfs_openargs { · 3 unmodified lines
321 int open_flags;326 int open_flags;
322 fmode_t fmode;327 fmode_t fmode;
323 __u64 clientid;328 __u64 clientid;
324 __u64 id;329 struct stateowner_id id;
325 union {330 union {
326 struct {331 struct {
327 struct iattr * attrs; /* UNCHECKED, GUARDED */332 struct iattr * attrs; /* UNCHECKED, GUARDED */
include/linux/nfsd/Kbuild+1−0
@@ -1,3 +1,4 @@
1header-y += cld.h
1header-y += debug.h2header-y += debug.h
2header-y += export.h3header-y += export.h
3header-y += nfsfh.h4header-y += nfsfh.h
include/linux/pinctrl/machine.h+3−1
@@ -12,6 +12,8 @@ · 11 unmodified lines
12#ifndef __LINUX_PINCTRL_MACHINE_H12#ifndef __LINUX_PINCTRL_MACHINE_H
13#define __LINUX_PINCTRL_MACHINE_H13#define __LINUX_PINCTRL_MACHINE_H
14 14
15#include <linux/bug.h>
16
15#include "pinctrl-state.h"17#include "pinctrl-state.h"
16 18
17enum pinctrl_map_type {19enum pinctrl_map_type {
@@ -148,7 +150,7 @@ struct pinctrl_map { · 130 unmodified lines
148#define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \150#define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \
149 PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)151 PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)
150 152
151#ifdef CONFIG_PINMUX153#ifdef CONFIG_PINCTRL
152 154
153extern int pinctrl_register_mappings(struct pinctrl_map const *map,155extern int pinctrl_register_mappings(struct pinctrl_map const *map,
154 unsigned num_maps);156 unsigned num_maps);
include/linux/pipe_fs_i.h+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
6#define PIPE_BUF_FLAG_LRU 0x01 /* page is on the LRU */6#define PIPE_BUF_FLAG_LRU 0x01 /* page is on the LRU */
7#define PIPE_BUF_FLAG_ATOMIC 0x02 /* was atomically mapped */7#define PIPE_BUF_FLAG_ATOMIC 0x02 /* was atomically mapped */
8#define PIPE_BUF_FLAG_GIFT 0x04 /* page is a gift */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 * struct pipe_buffer - a linux kernel pipe buffer12 * struct pipe_buffer - a linux kernel pipe buffer
include/linux/skbuff.h+4−3
@@ -238,11 +238,12 @@ enum { · 237 unmodified lines
238/*238/*
239 * The callback notifies userspace to release buffers when skb DMA is done in239 * The callback notifies userspace to release buffers when skb DMA is done in
240 * lower device, the skb last reference should be 0 when calling this.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 */
243struct ubuf_info {244struct ubuf_info {
244 void (*callback)(void *);245 void (*callback)(struct ubuf_info *);
245 void *arg;246 void *ctx;
246 unsigned long desc;247 unsigned long desc;
247};248};
248 249
include/linux/spi/spi.h+1−1
@@ -254,7 +254,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) · 253 unmodified lines
254 * driver is finished with this message, it must call254 * driver is finished with this message, it must call
255 * spi_finalize_current_message() so the subsystem can issue the next255 * spi_finalize_current_message() so the subsystem can issue the next
256 * transfer256 * transfer
257 * @prepare_transfer_hardware: there are currently no more messages on the257 * @unprepare_transfer_hardware: there are currently no more messages on the
258 * queue so the subsystem notifies the driver that it may relax the258 * queue so the subsystem notifies the driver that it may relax the
259 * hardware by issuing this call259 * hardware by issuing this call
260 *260 *
include/linux/usb/hcd.h+2−0
@@ -126,6 +126,8 @@ struct usb_hcd { · 125 unmodified lines
126 unsigned wireless:1; /* Wireless USB HCD */126 unsigned wireless:1; /* Wireless USB HCD */
127 unsigned authorized_default:1;127 unsigned authorized_default:1;
128 unsigned has_tt:1; /* Integrated TT in root hub */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 unsigned int irq; /* irq allocated */132 unsigned int irq; /* irq allocated */
131 void __iomem *regs; /* device memory/io */133 void __iomem *regs; /* device memory/io */
include/linux/usb/otg.h+1−0
@@ -94,6 +94,7 @@ struct usb_phy { · 93 unmodified lines
94 94
95 struct usb_otg *otg;95 struct usb_otg *otg;
96 96
97 struct device *io_dev;
97 struct usb_phy_io_ops *io_ops;98 struct usb_phy_io_ops *io_ops;
98 void __iomem *io_priv;99 void __iomem *io_priv;
99 100
include/linux/vm_event_item.h+3−2
@@ -26,13 +26,14 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, · 25 unmodified lines
26 PGFREE, PGACTIVATE, PGDEACTIVATE,26 PGFREE, PGACTIVATE, PGDEACTIVATE,
27 PGFAULT, PGMAJFAULT,27 PGFAULT, PGMAJFAULT,
28 FOR_ALL_ZONES(PGREFILL),28 FOR_ALL_ZONES(PGREFILL),
29 FOR_ALL_ZONES(PGSTEAL),29 FOR_ALL_ZONES(PGSTEAL_KSWAPD),
30 FOR_ALL_ZONES(PGSTEAL_DIRECT),
30 FOR_ALL_ZONES(PGSCAN_KSWAPD),31 FOR_ALL_ZONES(PGSCAN_KSWAPD),
31 FOR_ALL_ZONES(PGSCAN_DIRECT),32 FOR_ALL_ZONES(PGSCAN_DIRECT),
32#ifdef CONFIG_NUMA33#ifdef CONFIG_NUMA
33 PGSCAN_ZONE_RECLAIM_FAILED,34 PGSCAN_ZONE_RECLAIM_FAILED,
34#endif35#endif
35 PGINODESTEAL, SLABS_SCANNED, KSWAPD_STEAL, KSWAPD_INODESTEAL,36 PGINODESTEAL, SLABS_SCANNED, KSWAPD_INODESTEAL,
36 KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY,37 KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY,
37 KSWAPD_SKIP_CONGESTION_WAIT,38 KSWAPD_SKIP_CONGESTION_WAIT,
38 PAGEOUTRUN, ALLOCSTALL, PGROTATED,39 PAGEOUTRUN, ALLOCSTALL, PGROTATED,
include/net/dst.h+5−1
@@ -36,7 +36,11 @@ struct dst_entry { · 35 unmodified lines
36 struct net_device *dev;36 struct net_device *dev;
37 struct dst_ops *ops;37 struct dst_ops *ops;
38 unsigned long _metrics;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 struct dst_entry *path;44 struct dst_entry *path;
41 struct neighbour __rcu *_neighbour;45 struct neighbour __rcu *_neighbour;
42#ifdef CONFIG_XFRM46#ifdef CONFIG_XFRM
include/net/ip6_fib.h+48−0
@@ -123,6 +123,54 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) · 122 unmodified lines
123 return ((struct rt6_info *)dst)->rt6i_idev;123 return ((struct rt6_info *)dst)->rt6i_idev;
124}124}
125 125
126static 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
135static 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
144static 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
159static 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
126struct fib6_walker_t {174struct fib6_walker_t {
127 struct list_head lh;175 struct list_head lh;
128 struct fib6_node *root, *node;176 struct fib6_node *root, *node;
include/net/red.h+3−3
@@ -245,7 +245,7 @@ static inline unsigned long red_calc_qavg_from_idle_time(const struct red_parms · 244 unmodified lines
245 *245 *
246 * dummy packets as a burst after idle time, i.e.246 * dummy packets as a burst after idle time, i.e.
247 *247 *
248 * p->qavg *= (1-W)^m248 * v->qavg *= (1-W)^m
249 *249 *
250 * This is an apparently overcomplicated solution (f.e. we have to250 * This is an apparently overcomplicated solution (f.e. we have to
251 * precompute a table to make this calculation in reasonable time)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 unsigned int backlog)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 * The formula below is equvalent to floating point283 * The formula below is equvalent to floating point
284 * version: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 if (red_is_idling(v))390 if (red_is_idling(v))
391 qavg = red_calc_qavg_from_idle_time(p, v);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 qavg >>= p->Wlog;394 qavg >>= p->Wlog;
395 395
396 if (qavg > p->target_max && p->max_P <= MAX_P_MAX)396 if (qavg > p->target_max && p->max_P <= MAX_P_MAX)
include/net/sock.h+1−0
@@ -246,6 +246,7 @@ struct cg_proto; · 245 unmodified lines
246 * @sk_user_data: RPC layer private data246 * @sk_user_data: RPC layer private data
247 * @sk_sndmsg_page: cached page for sendmsg247 * @sk_sndmsg_page: cached page for sendmsg
248 * @sk_sndmsg_off: cached offset for sendmsg248 * @sk_sndmsg_off: cached offset for sendmsg
249 * @sk_peek_off: current peek_offset value
249 * @sk_send_head: front of stuff to transmit250 * @sk_send_head: front of stuff to transmit
250 * @sk_security: used by security modules251 * @sk_security: used by security modules
251 * @sk_mark: generic packet mark252 * @sk_mark: generic packet mark
include/scsi/libsas.h+36−4
@@ -217,11 +217,29 @@ struct domain_device { · 216 unmodified lines
217 struct kref kref;217 struct kref kref;
218};218};
219 219
220struct sas_discovery_event {220struct sas_work {
221 struct list_head drain_node;
221 struct work_struct work;222 struct work_struct work;
223};
224
225static 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
231struct sas_discovery_event {
232 struct sas_work work;
222 struct asd_sas_port *port;233 struct asd_sas_port *port;
223};234};
224 235
236static 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
225struct sas_discovery {243struct sas_discovery {
226 struct sas_discovery_event disc_work[DISC_NUM_EVENTS];244 struct sas_discovery_event disc_work[DISC_NUM_EVENTS];
227 unsigned long pending;245 unsigned long pending;
@@ -244,7 +262,7 @@ struct asd_sas_port { · 16 unmodified lines
244 struct list_head destroy_list;262 struct list_head destroy_list;
245 enum sas_linkrate linkrate;263 enum sas_linkrate linkrate;
246 264
247 struct work_struct work;265 struct sas_work work;
248 266
249/* public: */267/* public: */
250 int id;268 int id;
@@ -270,10 +288,17 @@ struct asd_sas_port { · 19 unmodified lines
270};288};
271 289
272struct asd_sas_event {290struct asd_sas_event {
273 struct work_struct work;291 struct sas_work work;
274 struct asd_sas_phy *phy;292 struct asd_sas_phy *phy;
275};293};
276 294
295static 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/* The phy pretty much is controlled by the LLDD.302/* The phy pretty much is controlled by the LLDD.
278 * The class only reads those fields.303 * The class only reads those fields.
279 */304 */
@@ -333,10 +358,17 @@ struct scsi_core { · 53 unmodified lines
333};358};
334 359
335struct sas_ha_event {360struct sas_ha_event {
336 struct work_struct work;361 struct sas_work work;
337 struct sas_ha_struct *ha;362 struct sas_ha_struct *ha;
338};363};
339 364
365static 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
340enum sas_ha_state {372enum sas_ha_state {
341 SAS_HA_REGISTERED,373 SAS_HA_REGISTERED,
342 SAS_HA_DRAINING,374 SAS_HA_DRAINING,
include/scsi/sas_ata.h+2−2
@@ -37,7 +37,7 @@ static inline int dev_is_sata(struct domain_device *dev) · 36 unmodified lines
37}37}
38 38
39int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy);39int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy);
40int sas_ata_init_host_and_port(struct domain_device *found_dev);40int sas_ata_init(struct domain_device *dev);
41void sas_ata_task_abort(struct sas_task *task);41void sas_ata_task_abort(struct sas_task *task);
42void sas_ata_strategy_handler(struct Scsi_Host *shost);42void sas_ata_strategy_handler(struct Scsi_Host *shost);
43void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,43void 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 return 0;53 return 0;
54}54}
55static inline int sas_ata_init_host_and_port(struct domain_device *found_dev)55static inline int sas_ata_init(struct domain_device *dev)
56{56{
57 return 0;57 return 0;
58}58}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t