Strings containing "ptp_qoriq" or "qoriq_ptp" which were used for structure/function names were complained by users. Let's just use the unique "ptp_qoriq" to make these names more consistent. This patch is just to unify the names using "ptp_qoriq". It hasn't changed any functions.
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -49,7 +49,7 @@ struct etts_regs { · 48 unmodified lines | |||
| 49 | u32 tmr_etts2_l; /* Timestamp of general purpose external trigger */ | 49 | u32 tmr_etts2_l; /* Timestamp of general purpose external trigger */ |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | struct qoriq_ptp_registers { | 52 | struct ptp_qoriq_registers { |
| 53 | struct ctrl_regs __iomem *ctrl_regs; | 53 | struct ctrl_regs __iomem *ctrl_regs; |
| 54 | struct alarm_regs __iomem *alarm_regs; | 54 | struct alarm_regs __iomem *alarm_regs; |
| 55 | struct fiper_regs __iomem *fiper_regs; | 55 | struct fiper_regs __iomem *fiper_regs; |
| @@ -136,9 +136,9 @@ struct qoriq_ptp_registers { · 80 unmodified lines | |||
| 136 | #define DEFAULT_FIPER1_PERIOD 1000000000 | 136 | #define DEFAULT_FIPER1_PERIOD 1000000000 |
| 137 | #define DEFAULT_FIPER2_PERIOD 100000 | 137 | #define DEFAULT_FIPER2_PERIOD 100000 |
| 138 | 138 | ||
| 139 | struct qoriq_ptp { | 139 | struct ptp_qoriq { |
| 140 | void __iomem *base; | 140 | void __iomem *base; |
| 141 | struct qoriq_ptp_registers regs; | 141 | struct ptp_qoriq_registers regs; |
| 142 | spinlock_t lock; /* protects regs */ | 142 | spinlock_t lock; /* protects regs */ |
| 143 | struct ptp_clock *clock; | 143 | struct ptp_clock *clock; |
| 144 | struct ptp_clock_info caps; | 144 | struct ptp_clock_info caps; |
| @@ -172,12 +172,12 @@ static inline void qoriq_write(unsigned __iomem *addr, u32 val) · 27 unmodified lines | |||
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | #ifdef CONFIG_DEBUG_FS | 174 | #ifdef CONFIG_DEBUG_FS |
| 175 | void ptp_qoriq_create_debugfs(struct qoriq_ptp *qoriq_ptp); | 175 | void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq); |
| 176 | void ptp_qoriq_remove_debugfs(struct qoriq_ptp *qoriq_ptp); | 176 | void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq); |
| 177 | #else | 177 | #else |
| 178 | static inline void ptp_qoriq_create_debugfs(struct qoriq_ptp *qoriq_ptp) | 178 | static inline void ptp_qoriq_create_debugfs(struct ptp_qoriq *ptp_qoriq) |
| 179 | { } | 179 | { } |
| 180 | static inline void ptp_qoriq_remove_debugfs(struct qoriq_ptp *qoriq_ptp) | 180 | static inline void ptp_qoriq_remove_debugfs(struct ptp_qoriq *ptp_qoriq) |
| 181 | { } | 181 | { } |
| 182 | #endif | 182 | #endif |
| 183 | 183 | ||