Re: [PATCH] ufs: [bl]e*_add_cpu conversion

[Marcin Slusarz]

On Tue, Feb 19, 2008 at 10:16:21PM +0300, Evgeniy Dushistov wrote:
> On Tue, Feb 19, 2008 at 06:45:42PM +0100, Marcin Slusarz wrote:
> > On Tue, Feb 19, 2008 at 12:22:19AM +0100, Roel Kluin wrote:
> > > Andrew Morton wrote:
> > > > On Wed, 13 Feb 2008 10:41:44 +0100 Roel Kluin <12o3l@xxxxxxxxxx> wrote:
> > > > 
> > > >> you may also want these:
> > > >> ---
> > > >> [bl]e_add_cpu conversion in return
> > > 
> > > > upsets powerpc (at least):
> > > > 
> > > > fs/ufs/swab.h: In function `fs64_add':
> > > > fs/ufs/swab.h:47: warning: passing arg 1 of `le64_add_cpu' from incompatible pointer type
> > > > fs/ufs/swab.h:49: warning: passing arg 1 of `be64_add_cpu' from incompatible pointer type
> > > > fs/ufs/swab.h: In function `fs64_sub':
> > > > fs/ufs/swab.h:58: warning: passing arg 1 of `le64_add_cpu' from incompatible pointer type
> > > > fs/ufs/swab.h:60: warning: passing arg 1 of `be64_add_cpu' from incompatible pointer type
> > > 
> > > sorry for this. Is it correct to cast like the patch below does?
> > I don't think so. Their prototypes are wrong. We can:
> > a) remove fs64_add and fs64_sub as nobody use them
> > b) fix them - change second parameter do __fs64 (and convert to [bl]e64_add_cpu)
> > 
> > Evgeniy?
> > 
> 
> I vote for removing unused code.
ok, patch below:

---
ufs: remove unused fs64_add and fs64_sub

remove fs64_add and fs64_sub - they probably weren't ever
used because their prototypes used u32 instead of __fs64

Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
Cc: Evgeniy Dushistov <dushistov@xxxxxxx>
---
 fs/ufs/swab.h |   18 ------------------
 1 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
index a4340d0..c89e6ad 100644
--- a/fs/ufs/swab.h
+++ b/fs/ufs/swab.h
@@ -41,24 +41,6 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
 }
 
 static __inline u32
-fs64_add(struct super_block *sbp, u32 *n, int d)
-{
-	if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-		return *n = cpu_to_le64(le64_to_cpu(*n)+d);
-	else
-		return *n = cpu_to_be64(be64_to_cpu(*n)+d);
-}
-
-static __inline u32
-fs64_sub(struct super_block *sbp, u32 *n, int d)
-{
-	if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-		return *n = cpu_to_le64(le64_to_cpu(*n)-d);
-	else
-		return *n = cpu_to_be64(be64_to_cpu(*n)-d);
-}
-
-static __inline u32
 fs32_to_cpu(struct super_block *sbp, __fs32 n)
 {
 	if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
-- 
1.5.3.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/