Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / include / linux / hw_random.h

diff --git a/include/linux/hw_random.h b/include/linux/hw_random.h
index 85d1191..9bede76 100644 (file)
--- a/include/linux/hw_random.h
+++ b/include/linux/hw_random.h
@@ -11,7 +11,6 @@
 
 #ifndef LINUX_HWRANDOM_H_
 #define LINUX_HWRANDOM_H_
-#ifdef __KERNEL__
 
 #include <linux/types.h>
 #include <linux/list.h>
@@ -23,10 +22,12 @@
  * @cleanup:           Cleanup callback (can be NULL).
  * @data_present:      Callback to determine if data is available
  *                     on the RNG. If NULL, it is assumed that
- *                     there is always data available.
+ *                     there is always data available.  *OBSOLETE*
  * @data_read:         Read data from the RNG device.
  *                     Returns the number of lower random bytes in "data".
- *                     Must not be NULL.
+ *                     Must not be NULL.    *OSOLETE*
+ * @read:              New API. drivers can fill up to max bytes of data
+ *                     into the buffer. The buffer is aligned for any type.
  * @priv:              Private data, for use by the RNG driver.
  */
 struct hwrng {
@@ -35,6 +36,7 @@ struct hwrng {
        void (*cleanup)(struct hwrng *rng);
        int (*data_present)(struct hwrng *rng, int wait);
        int (*data_read)(struct hwrng *rng, u32 *data);
+       int (*read)(struct hwrng *rng, void *data, size_t max, bool wait);
        unsigned long priv;
 
        /* internal. */
@@ -46,5 +48,4 @@ extern int hwrng_register(struct hwrng *rng);
 /** Unregister a Hardware Random Number Generator driver. */
 extern void hwrng_unregister(struct hwrng *rng);
 
-#endif /* __KERNEL__ */
 #endif /* LINUX_HWRANDOM_H_ */