diff options
| author | Moore, Eric Dean <Eric.Moore@lsil.com> | 2005-05-11 19:37:26 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-20 16:47:54 -0400 |
| commit | d485eb830576eef911727b1347402e9a708998a2 (patch) | |
| tree | 497abb8f1cf8f82969647e0844da6752042f220a /drivers/message/fusion/mptctl.c | |
| parent | 3fadc59d603caf70e7a5295158e4f6eb06dffb8f (diff) | |
[SCSI] fusion-kfree-cleanup
This patch is originally From: Jesper Juhl <juhl-lkml@dif.dk>
This patch gets rid of redundant NULL checks prior to calling kfree() in
drivers/message/* There are also a few small whitespace changes in there.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptctl.c')
| -rw-r--r-- | drivers/message/fusion/mptctl.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 7f9a87757df3..05ea5944c487 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
| @@ -99,14 +99,14 @@ struct buflist { | |||
| 99 | * arg contents specific to function. | 99 | * arg contents specific to function. |
| 100 | */ | 100 | */ |
| 101 | static int mptctl_fw_download(unsigned long arg); | 101 | static int mptctl_fw_download(unsigned long arg); |
| 102 | static int mptctl_getiocinfo (unsigned long arg, unsigned int cmd); | 102 | static int mptctl_getiocinfo(unsigned long arg, unsigned int cmd); |
| 103 | static int mptctl_gettargetinfo (unsigned long arg); | 103 | static int mptctl_gettargetinfo(unsigned long arg); |
| 104 | static int mptctl_readtest (unsigned long arg); | 104 | static int mptctl_readtest(unsigned long arg); |
| 105 | static int mptctl_mpt_command (unsigned long arg); | 105 | static int mptctl_mpt_command(unsigned long arg); |
| 106 | static int mptctl_eventquery (unsigned long arg); | 106 | static int mptctl_eventquery(unsigned long arg); |
| 107 | static int mptctl_eventenable (unsigned long arg); | 107 | static int mptctl_eventenable(unsigned long arg); |
| 108 | static int mptctl_eventreport (unsigned long arg); | 108 | static int mptctl_eventreport(unsigned long arg); |
| 109 | static int mptctl_replace_fw (unsigned long arg); | 109 | static int mptctl_replace_fw(unsigned long arg); |
| 110 | 110 | ||
| 111 | static int mptctl_do_reset(unsigned long arg); | 111 | static int mptctl_do_reset(unsigned long arg); |
| 112 | static int mptctl_hp_hostinfo(unsigned long arg, unsigned int cmd); | 112 | static int mptctl_hp_hostinfo(unsigned long arg, unsigned int cmd); |
| @@ -121,11 +121,11 @@ static long compat_mpctl_ioctl(struct file *f, unsigned cmd, unsigned long arg); | |||
| 121 | /* | 121 | /* |
| 122 | * Private function calls. | 122 | * Private function calls. |
| 123 | */ | 123 | */ |
| 124 | static int mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr); | 124 | static int mptctl_do_mpt_command(struct mpt_ioctl_command karg, void __user *mfPtr); |
| 125 | static int mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen); | 125 | static int mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen); |
| 126 | static MptSge_t *kbuf_alloc_2_sgl( int bytes, u32 dir, int sge_offset, int *frags, | 126 | static MptSge_t *kbuf_alloc_2_sgl(int bytes, u32 dir, int sge_offset, int *frags, |
| 127 | struct buflist **blp, dma_addr_t *sglbuf_dma, MPT_ADAPTER *ioc); | 127 | struct buflist **blp, dma_addr_t *sglbuf_dma, MPT_ADAPTER *ioc); |
| 128 | static void kfree_sgl( MptSge_t *sgl, dma_addr_t sgl_dma, | 128 | static void kfree_sgl(MptSge_t *sgl, dma_addr_t sgl_dma, |
| 129 | struct buflist *buflist, MPT_ADAPTER *ioc); | 129 | struct buflist *buflist, MPT_ADAPTER *ioc); |
| 130 | static void mptctl_timeout_expired (MPT_IOCTL *ioctl); | 130 | static void mptctl_timeout_expired (MPT_IOCTL *ioctl); |
| 131 | static int mptctl_bus_reset(MPT_IOCTL *ioctl); | 131 | static int mptctl_bus_reset(MPT_IOCTL *ioctl); |