Merge branch 'master' from gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev

[elogind.git] / extras / volume_id / volume_id / highpoint.c

diff --git a/extras/volume_id/volume_id/highpoint.c b/extras/volume_id/volume_id/highpoint.c
index 938a8934e57d6559f21a7735552fe6bafd671604..33c4a8c9c0bff7643838271697491d1ee1808a48 100644 (file)
--- a/extras/volume_id/volume_id/highpoint.c
+++ b/extras/volume_id/volume_id/highpoint.c
@@ -3,19 +3,9 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *     This library is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU Lesser General Public
- *     License as published by the Free Software Foundation; either
- *     version 2.1 of the License, or (at your option) any later version.
- *
- *     This library is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- *     Lesser General Public License for more details.
- *
- *     You should have received a copy of the GNU Lesser General Public
- *     License along with this library; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
  */
 
 #ifndef _GNU_SOURCE
@@ -32,7 +22,6 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <asm/types.h>
 
 #include "volume_id.h"
 #include "logging.h"
@@ -40,12 +29,12 @@
 #include "highpoint.h"
 
 struct hpt37x_meta {
-       __u8    filler1[32];
-       __u32   magic;
+       uint8_t         filler1[32];
+       uint32_t        magic;
 } __attribute__((packed));
 
 struct hpt45x_meta {
-       __u32   magic;
+       uint32_t        magic;
 } __attribute__((packed));
 
 #define HPT37X_CONFIG_OFF              0x1200
@@ -56,11 +45,11 @@ struct hpt45x_meta {
 #define HPT45X_MAGIC_BAD               0x5a7816fd
 
 
-int volume_id_probe_highpoint_37x_raid(struct volume_id *id, __u64 off)
+int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off)
 {
-       const __u8 *buf;
+       const uint8_t *buf;
        struct hpt37x_meta *hpt;
-       __u32 magic;
+       uint32_t magic;
 
        dbg("probing at offset 0x%llx", (unsigned long long) off);
 
@@ -79,12 +68,12 @@ int volume_id_probe_highpoint_37x_raid(struct volume_id *id, __u64 off)
        return 0;
 }
 
-int volume_id_probe_highpoint_45x_raid(struct volume_id *id, __u64 off, __u64 size)
+int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size)
 {
-       const __u8 *buf;
+       const uint8_t *buf;
        struct hpt45x_meta *hpt;
-       __u64 meta_off;
-       __u32 magic;
+       uint64_t meta_off;
+       uint32_t magic;
 
        dbg("probing at offset 0x%llx, size 0x%llx",
            (unsigned long long) off, (unsigned long long) size);