scsi: remove private implementation of get_unaligned_be32
Subsystems (2)
PATCH 1/1 scsi: remove private implementation of get_unaligned_be32
Signed-off-by Harvey Harrison <[email protected]>
--- drivers/scsi/libsas/sas_expander.c | 9 +++++---- include/scsi/scsi.h | 6 ------ 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/scsi/libsas/sas_expander.c +5 -4
@@ -24,6 +24,7 @@#include <linux/scatterlist.h> #include <linux/blkdev.h> +#include <asm/unaligned.h> #include "sas_internal.h"
@@ -541,10 +542,10 @@ int sas_smp_get_phy_events(struct sas_phy *phy)if (!res) goto out; - phy->invalid_dword_count =scsi_to_u32 (&resp[12 ]); - phy->running_disparity_error_count =scsi_to_u32 (&resp[16 ]); - phy->loss_of_dword_sync_count =scsi_to_u32 (&resp[20 ]); - phy->phy_reset_problem_count =scsi_to_u32 (&resp[24 ]); + phy->invalid_dword_count =get_unaligned_be32 (&resp[12 ]); + phy->running_disparity_error_count =get_unaligned_be32 (&resp[16 ]); + phy->loss_of_dword_sync_count =get_unaligned_be32 (&resp[20 ]); + phy->phy_reset_problem_count =get_unaligned_be32 (&resp[24 ]); out:kfree (resp);
include/scsi/scsi.h +0 -6
@@ -521,10 +521,4 @@ static inline void set_driver_byte(struct scsi_cmnd *cmd, char status)/* Used to obtain the PCI location of a device */ #define SCSI_IOCTL_GET_PCI 0x5387 -/* Pull a u32 out of a SCSI message (using BE SCSI conventions) */ -static inline __u32 scsi_to_u32 (__u8 *ptr) -{ -return (ptr[0 ]<<24 ) + (ptr[1 ]<<16 ) + (ptr[2 ]<<8 ) + ptr[3 ]; -} -#endif /* _SCSI_SCSI_H */
Signature · 1 line
1.6.0.2.471.g47a76